[12:07:18] atc135@niska ~/code.d $ mkdir test
[12:07:22] atc135@niska ~/code.d $ cd test
[12:07:23] atc135@niska ~/code.d/test $ git init
Initialized empty Git repository in /home/atc135/code.d/test/.git/


[12:07:31] atc135@niska ~/code.d/test $ touch foo
[12:07:56] atc135@niska ~/code.d/test $ touch foo-ssl
[12:08:00] atc135@niska ~/code.d/test $ git add *
[12:08:02] atc135@niska ~/code.d/test $ git commit -m 'add initial files'
[master (root-commit) 57efe3c] add initial files
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 foo
 create mode 100644 foo-ssl


[12:08:32] atc135@niska ~/code.d/test $ git branch prod
[12:08:36] atc135@niska ~/code.d/test $ git status
# On branch master
nothing to commit (working directory clean)


[12:08:50] atc135@niska ~/code.d/test $ mkdir bar
[12:09:08] atc135@niska ~/code.d/test $ git mv foo* bar
[12:09:17] atc135@niska ~/code.d/test $ git mv bar foo
[12:09:21] atc135@niska ~/code.d/test $ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       renamed:    foo -> foo/foo
#       renamed:    foo-ssl -> foo/foo-ssl
#


[12:09:22] atc135@niska ~/code.d/test $ git commit -a -m 'put those files in a subdir'
[master e3fc418] put those files in a subdir
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename foo => foo/foo (100%)
 rename foo-ssl => foo/foo-ssl (100%)


[12:10:30] atc135@niska ~/code.d/test $ echo blah > baz
[12:10:33] atc135@niska ~/code.d/test $ git add baz
[12:10:35] atc135@niska ~/code.d/test $ git commit -m 'add baz'
[master bc45aab] add baz
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 baz


[12:10:40] atc135@niska ~/code.d/test $ git checkout prod
Switched to branch 'prod'
[12:10:48] atc135@niska ~/code.d/test $ git cherry -v prod master
+ e3fc418ca355e0b013f64cc403e9ad6f1e2874ff put those files in a subdir
+ bc45aaba80ad88fbbd2dbdcb21ac5b9e6519e632 add baz


[12:10:55] atc135@niska ~/code.d/test $ git cherry-pick -x bc45aaba80ad88fbbd2dbdcb21ac5b9e6519e632
Automatic cherry-pick failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result with:

        git commit -c bc45aaba80ad88fbbd2dbdcb21ac5b9e6519e632

[12:11:05] atc135@niska ~/code.d/test $ git status
# On branch prod
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       new file:   baz
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       added by us:        foo
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       foo~HEAD