From: Vincent van Ravesteijn <vfr@lyx.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCHv2] Do not autosquash in case of an implied interactive rebase
Date: Mon, 28 May 2012 11:17:03 +0200 [thread overview]
Message-ID: <4FC3428F.4060202@lyx.org> (raw)
In-Reply-To: <7vehq8tajh.fsf@alter.siamese.dyndns.org>
Op 25-5-2012 19:50, Junio C Hamano schreef:
> Vincent van Ravesteijn<vfr@lyx.org> 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@lyx.org>
> 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
next prev parent reply other threads:[~2012-05-28 9:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-24 13:52 [PATCH] Do not autosquash in case of an implied interactive rebase Vincent van Ravesteijn
2012-05-24 13:57 ` [PATCHv2] " Vincent van Ravesteijn
2012-05-25 17:50 ` Junio C Hamano
2012-05-28 9:17 ` Vincent van Ravesteijn [this message]
2012-05-29 18:41 ` Junio C Hamano
2012-05-29 18:43 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FC3428F.4060202@lyx.org \
--to=vfr@lyx.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.