mikelietz mikelietz
mikelietz
/ gist:871926
Created
March 16, 2011 02:53
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [core] | |
| repositoryformatversion = 0 | |
| filemode = true | |
| bare = false | |
| logallrefupdates = true | |
| [user] | |
| # name = <username> | |
| # email = <email> | |
| [remote "origin"] | |
| fetch = +refs/heads/*:refs/remotes/origin/* |
mikelietz
/ gist:871912
Created
March 16, 2011 02:38
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [root@localhost] oars/tests/features # git pull origin builder | |
| remote: Counting objects: 306, done. | |
| remote: Compressing objects: 100% (45/45), done. | |
| remote: Total 247 (delta 199), reused 247 (delta 199) | |
| Receiving objects: 100% (247/247), 32.97 KiB, done. | |
| Resolving deltas: 100% (199/199), completed with 33 local objects. | |
| From github.com:nashape/oars | |
| * branch builder -> FETCH_HEAD | |
| Updating 9c73dc2..1d8bf17 | |
| Fast-forward |
mikelietz
/ gist:871891
Created
March 16, 2011 02:11
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| To [email protected]:nashape/oars.git | |
| ! [rejected] delivery -> delivery (non-fast-forward) | |
| ! [rejected] dev -> dev (non-fast-forward) | |
| ! [rejected] master -> master (non-fast-forward) | |
| error: failed to push some refs to '[email protected]:nashape/oars.git' | |
| To prevent you from losing history, non-fast-forward updates were rejected | |
| Merge the remote changes (e.g. 'git pull') before pushing again. See the | |
| 'Note about fast-forwards' section of 'git push --help' for details. |
NewerOlder