From: Johannes Sixt <j6t@kdbg.org>
To: David Kilzer <ddkilzer@kilzer.net>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] rebase -i -p: use rerere to resolve conflicts if enabled
Date: Sun, 17 Jun 2012 20:30:42 +0200 [thread overview]
Message-ID: <4FDE2252.5030802@kdbg.org> (raw)
In-Reply-To: <1917D067-6FB3-4393-B178-BBE36B4B5D4E@kilzer.net>
Am 17.06.2012 15:46, schrieb David Kilzer:
> If it could be guaranteed that all changes in a merge commit would be
> preserved when running "git rebase -i -p" with rerere.autoupdate
> enabled, I think that would be an argument for not returning control
> to the user during the rebase operation. However, changes to
> non-conflicted files in a merge commit are currently lost in this
> case, so it would be too dangerous to enable this behavior now.
You can test this patch:
git://repo.or.cz/git/mingw/j6t.git preserve-merges-by-cherry-pick
I think it suits you needs unless you run into the one use-case where
the patch is a regression (as documented by the new test_expect_failure
in the test suite).
-- Hannes
next prev parent reply other threads:[~2012-06-17 19:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-15 14:17 [PATCH] rebase -i -p: use rerere to resolve conflicts if enabled David D. Kilzer
2012-06-15 15:52 ` Junio C Hamano
2012-06-16 4:08 ` David Kilzer
2012-06-16 5:19 ` Junio C Hamano
2012-06-17 3:58 ` David Kilzer
2012-06-17 5:49 ` Junio C Hamano
2012-06-17 13:46 ` David Kilzer
2012-06-17 18:30 ` Johannes Sixt [this message]
2012-06-17 21:30 ` David Kilzer
2012-06-18 19:06 ` Johannes Sixt
2012-06-17 22:00 ` Junio C Hamano
2012-06-17 22:12 ` 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=4FDE2252.5030802@kdbg.org \
--to=j6t@kdbg.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=ddkilzer@kilzer.net \
--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.