projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eabdcd4 9d89b35)
Merge branch 'mg/killed-merge'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:10 +0000 (22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:10 +0000 (22:55 -0700)
commit6e6ba65a7c8f8f9556ec42678f661794d47f7f98
tree3a9714f9a2794a1511d974b79d20e124f2ef6a7dtree | snapshot
parenteabdcd4ab4b04af8f39e5ea3847b6d364acb874ecommit | diff
parent9d89b35526b54c3ba33371b184a1ba6e30f8f46fcommit | diff
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
Documentation/git-merge.txt diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.