]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f7ac90 a3ec9ea)
Merge branch 'en/sequencer-empty-edit-result-aborts'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:52 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:52 +0000 (10:30 -0700)
"git rebase" etc. in Git 2.19 fails to abort when given an empty
commit log message as result of editing, which has been corrected.

* en/sequencer-empty-edit-result-aborts:
  sequencer: fix --allow-empty-message behavior, make it smarter

1  2 
sequencer.c patch | diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh patch | diff1 | diff2 | blob | history

diff --cc sequencer.c
Simple merge
diff --cc t/t3404-rebase-interactive.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.