From: Stephen Kelly <steveire@gmail.com>
To: git@vger.kernel.org
Subject: Re: git interactive rebase 'consume' command
Date: Sun, 20 Jan 2013 15:23:11 +0100 [thread overview]
Message-ID: <kdgukd$jlm$1@ger.gmane.org> (raw)
In-Reply-To: 20130120141725.GL31172@serenity.lan
John Keeping wrote:
>> Any thoughts on that?
>
> Are you aware of the "--autosqush" option to git-rebase (and the
> "rebase.autosquash" config setting)? I find that using that combined
> with the "--fixup" option to git-commit makes this workflow a lot more
> intuitive.
Yes, I'm aware of it, but I think it's not related to the proposal I made.
Mostly my proposal is about avoiding unnecessary conflict resolution.
Thanks,
Steve.
next prev parent reply other threads:[~2013-01-20 14:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 14:05 git interactive rebase 'consume' command Stephen Kelly
2013-01-20 14:17 ` John Keeping
2013-01-20 14:23 ` Stephen Kelly [this message]
2013-01-20 19:05 ` Junio C Hamano
2013-01-20 19:13 ` Stephen Kelly
2013-01-20 20:23 ` Junio C Hamano
2013-01-21 1:49 ` Jeff King
2013-01-21 8:40 ` Stephen Kelly
2013-01-21 11:05 ` Michael Haggerty
2013-01-21 19:05 ` Stephen Kelly
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='kdgukd$jlm$1@ger.gmane.org' \
--to=steveire@gmail.com \
--cc=git@vger.kernel.org \
/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.