Merge branch 'bp/commit-p-editor' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:07:06 +0000 (8 12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:07:06 +0000 (8 12:07 -0700)
* bp/commit-p-editor:
  run-command: mark run_hook_with_custom_index as deprecated
  merge hook tests: fix and update tests
  merge: fix GIT_EDITOR override for commit hook
  commit: fix patch hunk editing with "commit -p -m"
  test patch hunk editing with "commit -p -m"
  merge hook tests: use 'test_must_fail' instead of '!'
  merge hook tests: fix missing '&&' in test

1  2 
builtin/checkout.c
builtin/commit.c
commit.h

Simple merge
Simple merge
diff --cc commit.h
Simple merge