Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
author
Junio C Hamano
<gitster@pobox.com>
Thu, 29 Mar 2018 18:08:09 +0000
(11:08 -0700)
committer
Junio 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
raw
|
combined
(merge:
0f57f73
3d94616
)
diff --cc
sequencer.c
Simple merge