Skip to content

Instantly share code, notes, and snippets.

@findchris
Created January 26, 2010 00:18
Show Gist options
  • Save findchris/286416 to your computer and use it in GitHub Desktop.
Save findchris/286416 to your computer and use it in GitHub Desktop.
[cornice_app(master)]$ git branch test_branch
[cornice_app(master)]$ git checkout test_branch
Switched to branch "test_branch"
[cornice_app(test_branch)]$ mate README
[cornice_app(test_branch)]$ git commit -a -m "Improved file significantly."
[test_branch 6bba901] Improved file significantly.
1 files changed, 1 insertions(+), 0 deletions(-)
[cornice_app(test_branch)]$ git checkout master
Switched to branch "master"
[cornice_app(master)]$ git merge test_branch
Updating 197ab8c..6bba901
Fast forward
README | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
[16:15][cornice_app(master)]$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment