diff options
| author | Vincent van Ravesteijn <vfr@lyx.org> | 2012-05-24 13:57:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-17 14:01:42 -0700 |
| commit | 941cab3a78a3fd3d21ba3acb3f8da3407a692015 (patch) | |
| tree | 749c3eec1e754e46584fa4b9e164b92554e1cecd /t/t8004-blame-with-conflicts.sh | |
| parent | ca4effd8bce5e0dfce7ce1425074475c8643b7f0 (diff) | |
| download | git-941cab3a78a3fd3d21ba3acb3f8da3407a692015.tar.gz git-941cab3a78a3fd3d21ba3acb3f8da3407a692015.tar.xz | |
Do not autosquash in case of an implied interactive rebase
The option to autosquash is only used in case of an interactive rebase.
When merges are preserved, rebase uses an interactive rebase internally,
but in this case autosquash should still be disabled.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t8004-blame-with-conflicts.sh')
0 files changed, 0 insertions, 0 deletions