diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:28:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:28:01 -0700 |
| commit | 4336b53c66bf6b1de061ef38c5d281544261dc3e (patch) | |
| tree | 3980ddb3216b70bf72286f652e8f22f50aa4d747 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | Merge branch 'mm/levenstein-penalize-deletion-less' (diff) | |
| parent | Do not autosquash in case of an implied interactive rebase (diff) | |
| download | tgif-4336b53c66bf6b1de061ef38c5d281544261dc3e.tar.xz | |
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
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions