gistfile1.txt

C:\consulting\git-bug>git init
Initialized empty Git repository in C:/consulting/git-bug/.git/

C:\consulting\git-bug>echo foo > x

C:\consulting\git-bug>git add x

C:\consulting\git-bug>git commit -m "Initial commit"
[master (root-commit) 2da6949] Initial commit
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 x

C:\consulting\git-bug>git checkout -b abranch
Switched to a new branch 'abranch'

C:\consulting\git-bug>echo bar > x

C:\consulting\git-bug>git commit -m "Update." x
[abranch 40669d5] Update.
 1 files changed, 1 insertions(+), 1 deletions(-)

C:\consulting\git-bug>git checkout master
Switched to branch 'master'

C:\consulting\git-bug>echo baz > y

C:\consulting\git-bug>git add y

C:\consulting\git-bug>git commit -m "Add y."
[master ed690d9] Add y.
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 y

C:\consulting\git-bug>git checkout abranch
Switched to branch 'abranch'

C:\consulting\git-bug>git merge --no-commit master
Automatic merge went well; stopped before committing as requested

C:\consulting\git-bug>git st
# On branch abranch
# Changes to be committed:
#
#       new file:   y
#

C:\consulting\git-bug>echo waz > y

C:\consulting\git-bug>git st
# On branch abranch
# Changes to be committed:
#
#       new file:   y
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   y
#

C:\consulting\git-bug>git stash -k
Saved working directory and index state WIP on abranch: 40669d5 Update.
HEAD is now at 40669d5 Update.

C:\consulting\git-bug>git commit -m "Merge."
[abranch 055c174] Merge.
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 y

C:\consulting\git-bug>git cat-file -p HEAD
tree e13c469b83f8e1e0207802144baea8e5af2c367b
parent 40669d539f9b12097f2f88a9341cc5a37bbc034f
author jnthn <[email protected]> 1367944862 +0200
committer jnthn <[email protected]> 1367944862 +0200

Merge.