Merge branch 'nd/split-index'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:25:40 +0000 (11:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:25:40 +0000 (11:25 -0700)
commit788cef8...d40070d5755490441abad1a27bc120b7
treeebc44e5...83def9855aac4559e87f201882d8f955copy hash to clipboard (tree)
parente0a064a...0749a8039f28e9bd3de0ffb5cf99e678copy hash to clipboard (diff)
parent3e52f70...1505956bf91cb7b107e526d1c67da0a6copy hash to clipboard (diff)
17 files changed:
.gitignore
Makefile
builtin/apply.c
builtin/blame.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/merge.c
builtin/mv.c
builtin/reset.c
builtin/update-index.c
cache.h
merge-recursive.c
merge.c
read-cache.c
sequencer.c
unpack-trees.c