]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f57f73 3d94616)
Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Mar 2018 18:08:09 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Mar 2018 18:08:09 +0000 (11:08 -0700)
* pw/rebase-keep-empty-fixes:
  rebase: respect --no-keep-empty
  rebase -i --keep-empty: don't prune empty commits
  rebase --root: stop assuming squash_onto is unset
  Git 2.16.2

1  2 
sequencer.c patch | diff1 | diff2 | blob | history

diff --cc sequencer.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.