Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

just a test #721

Closed
wants to merge 15 commits into from
Commits on Feb 14, 2013
  1. @mpaf

    Update README

    mpaf authored
  2. @mpaf

    Update README

    mpaf authored
  3. @mpaf

    Update README

    mpaf authored
  4. @mpaf

    deleting a file

    mpaf authored
  5. @mpaf

    Create newfile

    mpaf authored
  6. @mpaf

    Update newfile

    mpaf authored
  7. @mpaf

    Update newfile

    mpaf authored
  8. @mpaf

    changes to file

    mpaf authored
  9. @mpaf

    Merge branch 'master' of github.com:mpaf/Spoon-Knife

    mpaf authored
    Conflicts:
    	newfile
  10. @mpaf

    Update newfile

    mpaf authored
  11. @mpaf

    new commit

    mpaf authored
  12. @mpaf
  13. @mpaf

    Update newfile

    mpaf authored
  14. @mpaf

    sdfs

    mpaf authored
  15. @mpaf

    Merge remote-tracking branch 'origin'

    mpaf authored
    Conflicts:
    	newfile
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 64 deletions.
  1. +3 −1 README
  2. +0 −63 index.html
  3. +2 −0  newfile
View
4 README
@@ -1 +1,3 @@
-All that's missing is the fork. Heh.
+All that's missing is the fork. Heh.
+
+Add some changes here, let's see how git behaves!
View
63 index.html
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
- <title>Spoon-Knife</title>
- <style type="text/css">
- * {
- margin:0px;
- padding:0px;
- }
-
- #octocat {
- display: block;
- width:384px;
- margin: 50px auto;
- }
-
- p {
- display: block;
- width: 400px;
- margin: 50px auto;
- font: 30px Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
- }
- #rainbow-message {
- position: absolute;
- right: 10px;
- top: 10px;
- box-shadow: -5px 10px 15px gray;
- -moz-box-shadow: -5px 10px 15px gray;
- font-family: sans-serif;
- }
-
- </style>
- <script type="text/javascript">
- var keyCodes=new Array(10);
- var pattern=[38,38,40,40,37,39,37,39,66,65];
- function keydownHandler(e){
- keyCodes.shift();
- keyCodes.push(e.keyCode);
- if(keyCodes.every(function(element, index, array){return element===pattern[index];})){
- document.getElementById("rainbow-message").style.display="";
- }
- }
- window.onkeydown=keydownHandler;
- </script>
-
-</head>
-
-<body>
-
-<img src="forkit.gif" id="octocat" alt="" />
-
-<p>
- Fork me? No, fork you!
-</p>
-<div id="rainbow-message" style="display:none">
-Double repositories all the way across the sky!<br/>
-<a href="http://help.github.com/fork-a-repo/">What does it mean?</a>
-</div>
-</body>
-</html>
View
2  newfile
@@ -0,0 +1,2 @@
+
+o========
Something went wrong with that request. Please try again.