$ git checkout mybranch $ echo "Work, work, work" >>hello -$ git commit -m 'Some work.' hello+$ git commit -m 'Some work.' -i hello
$ git checkout mybranch $ echo "Work, work, work" >>hello -$ git commit -m 'Some work.' hello+$ git commit -m 'Some work.' -i hello
Here, we just added another line to hello, and we used a shorthand for doing both git-update-index hello and git commit by just giving the @@ -1105,7 +1105,7 @@ hasn't happened in the master branch at all. Then do
$ echo "Play, play, play" >>hello $ echo "Lots of fun" >>example -$ git commit -m 'Some fun.' hello example+$ git commit -m 'Some fun.' -i hello example
since the master branch is obviously in a much better mood.
Now, you've got two branches, and you decide that you want to merge the @@ -1161,7 +1161,7 @@ Work, work, work
and once you're happy with your manual merge, just do a
$ git commit hello+
$ git commit -i hello
which will very loudly warn you that you're now committing a merge (which is correct, so never mind), and you can write a small merge @@ -2011,7 +2011,7 @@ to follow, not easier.