projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a824d3 8a6dae1)
Merge branch 'vr/rebase-autosquash-does-not-imply-i'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:28:01 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:28:01 +0000 (13:28 -0700)
commit4336b53c66bf6b1de061ef38c5d281544261dc3e
tree3980ddb3216b70bf72286f652e8f22f50aa4d747tree | snapshot
parent7a824d3c463c87b75f17baa0c6ff8d4b8c6bdafbcommit | diff
parent8a6dae108eadbd2882296981e03fd8e251d42f56commit | diff
Merge branch 'vr/rebase-autosquash-does-not-imply-i'

"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
Git—the stupid content tracker