From: Johannes Sixt <j.sixt@viscovery.net>
To: "Hrvoje Nikšić" <hniksic@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Converting merge to rebase in the presence of conflicts
Date: Mon, 11 Apr 2011 17:03:07 +0200 [thread overview]
Message-ID: <4DA3182B.2030305@viscovery.net> (raw)
In-Reply-To: <BANLkTi=krC6JMEWj=a5CY1vRCcmh9b+BaQ@mail.gmail.com>
Am 4/11/2011 16:13, schrieb Hrvoje Nikšić:
> Is there a way to rebase the branch without redoing conflict
> resolution?
git config --global rerere.enabled true
-- Hannes
next prev parent reply other threads:[~2011-04-11 15:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-11 14:13 Converting merge to rebase in the presence of conflicts Hrvoje Nikšić
2011-04-11 14:39 ` Michael J Gruber
2011-04-11 15:03 ` Johannes Sixt [this message]
2011-04-11 15:15 ` Hrvoje Nikšić
2011-04-12 2:55 ` Michael Haggerty
2011-04-12 6:11 ` Johannes Sixt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DA3182B.2030305@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=hniksic@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).