Skip to content

Instantly share code, notes, and snippets.

@zmack
Created July 31, 2009 11:26
Show Gist options
  • Save zmack/159183 to your computer and use it in GitHub Desktop.
Save zmack/159183 to your computer and use it in GitHub Desktop.
[zmack@cartofior randomista (master)]$ gco -b foo
Switched to a new branch 'foo'
[zmack@cartofior randomista (foo)]$ gst
# On branch foo
nothing to commit (working directory clean)
[zmack@cartofior randomista (foo)]$ echo "moloz" > foo
[zmack@cartofior randomista (foo)]$ gst
# On branch foo
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# foo
nothing added to commit but untracked files present (use "git add" to track)
[zmack@cartofior randomista (foo)]$ ga .
[zmack@cartofior randomista (foo)]$ gci -m "Added moloz"
[foo 66a162f] Added moloz
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
[zmack@cartofior randomista (foo)]$ git push foo
error: failed to push some refs to 'foo'
[zmack@cartofior randomista (foo)]$ git push origin foo
Counting objects: 4, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 271 bytes, done.
Total 3 (delta 1), reused 0 (delta 0)
To [email protected]:zmack/randomista.git
* [new branch] foo -> foo
[zmack@cartofior randomista (foo)]$ gco master
Switched to branch 'master'
[zmack@cartofior randomista (master)]$ git merge foo
Updating 88368bf..66a162f
Fast forward
foo | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
[zmack@cartofior randomista (master)]$ git push
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:zmack/randomista.git
88368bf..66a162f HEAD -> master
[zmack@cartofior randomista (master)]$ gst
# On branch master
nothing to commit (working directory clean)
[zmack@cartofior randomista (master)]$ git log
commit 66a162f59a8f57ddb3afd0fe3d9d6b2aadb53672
Author: Andrei Bocan <[email protected]>
Date: Fri Jul 31 14:24:50 2009 +0300
Added moloz
commit 88368bfef58b62dcf5c4fadfc7ca650f9b20e791
Author: Andrei Bocan <[email protected]>
Date: Wed Jun 3 18:59:59 2009 +0300
Initial commit
[zmack@cartofior randomista (master)]$ gst
# On branch master
nothing to commit (working directory clean)
[zmack@cartofior randomista (master)]$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment