Op 25-5-2012 19:50, Junio C Hamano schreef:
Vincent van Ravesteijn<vfr@xxxxxxx> writes:
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@xxxxxxx>
Hrm, what if the end user said "git rebase --autosquash -p" explicitly
from the command line?
The option "--autosquash" is designed to have no effect whenever
"--interactive" is not supplied.
This is what you also argue in another thread
(http://permalink.gmane.org/gmane.comp.version-control.git/198579):
\"And that "I want rebase with --autosquash but I am not going to do any
other editing" is where my suggestion to use "--no-edit" comes from.\"
Or did you mean that you want to imply "--interactive" when
"--autosquash" is explicitly given ?
Vincent
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html