diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-19 10:47:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-19 10:47:56 +0900 |
| commit | 0543de438f39cc99bcde807313e972a6caac5840 (patch) | |
| tree | 4237ec20e44a097a32834a3d17b4413b47eae6b4 /merge-recursive.c | |
| parent | 09595ab3818619a34281b85e1fb98802182e12a2 (diff) | |
| parent | f8b863598c991a5441d97e5dc59af8968ea37e37 (diff) | |
| download | git-0543de438f39cc99bcde807313e972a6caac5840.tar.gz git-0543de438f39cc99bcde807313e972a6caac5840.tar.xz | |
Merge branch 'sb/merge-commit-msg-hook'
As "git commit" to conclude a conflicted "git merge" honors the
commit-msg hook, "git merge" that recoreds a merge commit that
cleanly auto-merges should, but it didn't.
* sb/merge-commit-msg-hook:
builtin/merge: honor commit-msg hook for merges
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions