| commit | 0543de438f39cc99bcde807313e972a6caac5840 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Sep 2017 01:47:56 +0000 (19 10:47 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Sep 2017 01:47:56 +0000 (19 10:47 +0900) | ||
| tree | 4237ec20e44a097a32834a3d17b4413b47eae6b4 | treesnapshot (tar.gz zip) |
| parent | 09595ab3818619a34281b85e1fb98802182e12a2 | commitdiff |
| parent | f8b863598c991a5441d97e5dc59af8968ea37e37 | commitdiff |
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
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
| builtin/merge.c | diff1 | diff2 | blobhistory |