Merge branch 'bp/commit-p-editor' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:07:06 +0000 (12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:07:06 +0000 (12:07 -0700)
commit86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9
treee3d0929979a9874bc9864e9d48bd6daec4abc110
parent2f91649a9ba7c590be4f1ce66521b21e305fb7bc
parentb549be0da7ff9075c0b3de14c1d5d03583ca8d2d
Merge branch 'bp/commit-p-editor' into maint

* 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
builtin/checkout.c
builtin/commit.c
commit.h