diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-26 22:55:10 -0700 |
| commit | 6e6ba65a7c8f8f9556ec42678f661794d47f7f98 (patch) | |
| tree | 3a9714f9a2794a1511d974b79d20e124f2ef6a7d /Documentation/git-init-db.txt | |
| parent | eabdcd4ab4b04af8f39e5ea3847b6d364acb874e (diff) | |
| parent | 9d89b35526b54c3ba33371b184a1ba6e30f8f46f (diff) | |
| download | git-6e6ba65a7c8f8f9556ec42678f661794d47f7f98.tar.gz git-6e6ba65a7c8f8f9556ec42678f661794d47f7f98.tar.xz | |
Merge branch 'mg/killed-merge'
Killing "git merge --edit" before the editor returns control left
the repository in a state with MERGE_MSG but without MERGE_HEAD,
which incorrectly tells the subsequent "git commit" that there was
a squash merge in progress. This has been fixed.
* mg/killed-merge:
merge: save merge state earlier
merge: split write_merge_state in two
merge: clarify call chain
Documentation/git-merge: explain --continue
Diffstat (limited to 'Documentation/git-init-db.txt')
0 files changed, 0 insertions, 0 deletions