Created
August 20, 2010 23:32
-
-
Save jgeewax/541437 to your computer and use it in GitHub Desktop.
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
(rc-1.0)jj@im-jj:~/demo$ git checkout master | |
Switched to branch 'master' | |
(master)jj@im-jj:~/demo$ git merge rc-1.0 | |
Merge made by recursive. | |
mynewfile.txt | 1 + | |
mynewfile2.txt | 1 + | |
2 files changed, 2 insertions(+), 0 deletions(-) | |
create mode 100644 mynewfile.txt | |
create mode 100644 mynewfile2.txt | |
(master)jj@im-jj:~/demo$ git push | |
Counting objects: 4, done. | |
Delta compression using up to 2 threads. | |
Compressing objects: 100% (2/2), done. | |
Writing objects: 100% (2/2), 331 bytes, done. | |
Total 2 (delta 1), reused 0 (delta 0) | |
To my-server:/git/demo.git | |
af218a9..b4c7ac5 HEAD -> master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment