| commit | 4336b53c66bf6b1de061ef38c5d281544261dc3e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jun 2012 20:28:01 +0000 (1 13:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Jun 2012 20:28:01 +0000 (1 13:28 -0700) | ||
| tree | 3980ddb3216b70bf72286f652e8f22f50aa4d747 | treesnapshot (tar.gz zip) |
| parent | 7a824d3c463c87b75f17baa0c6ff8d4b8c6bdafb | commitdiff |
| parent | 8a6dae108eadbd2882296981e03fd8e251d42f56 | commitdiff |
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 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