summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-branch-rebase.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-26 22:55:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-26 22:55:10 -0700
commit6e6ba65a7c8f8f9556ec42678f661794d47f7f98 (patch)
tree3a9714f9a2794a1511d974b79d20e124f2ef6a7d /Documentation/howto/revert-branch-rebase.txt
parentMerge branch 'jt/packmigrate' (diff)
parentmerge: save merge state earlier (diff)
downloadtgif-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/howto/revert-branch-rebase.txt')
0 files changed, 0 insertions, 0 deletions