Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'vr/rebase-autosquash-does-not-imply-i'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 1 Jun 2012 20:28:01 +0000
(13:28 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 1 Jun 2012 20:28:01 +0000
(13:28 -0700)
"git rebase -p" used to pay attention to rebase.autosquash which was
wrong. "git rebase -p -i" should, but "git rebase -p" by itself
should not.
By Vincent van Ravesteijn
* vr/rebase-autosquash-does-not-imply-i:
Do not autosquash in case of an implied interactive rebase
raw
|
combined
(merge:
7a824d3
8a6dae1
)
Trivial merge