From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Apr 2014 19:07:06 +0000 (-0700)
Subject: Merge branch 'bp/commit-p-editor' into maint
X-Git-Tag: v1.9.2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9;p=git

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
---

86b4c1639c4a44fa8c10a7c438c5af24ca87e2a9