From: Jay Soffian <jaysoffian@gmail.com>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: "Magnus Bäck" <magnus.back@sonyericsson.com>, git@vger.kernel.org
Subject: Re: Status of conflicted files resolved with rerere
Date: Fri, 13 Aug 2010 13:19:47 -0400 [thread overview]
Message-ID: <AANLkTi=0dV54q6o3f-XrxKAHDKn8mhWFmsLDen_3+1G7@mail.gmail.com> (raw)
In-Reply-To: <AANLkTi=tVV5gL2b2LfXALXahzabJXzVjB5z9-OSztOMJ@mail.gmail.com>
On Thu, Aug 12, 2010 at 5:36 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
> That said, I've never had a problem where rerere did the wrong thing
> for me. Maybe there could be an option to override it.
$ git config rerere.autoupdate true
j.
next prev parent reply other threads:[~2010-08-13 17:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-12 21:28 Status of conflicted files resolved with rerere Magnus Bäck
2010-08-12 21:36 ` Avery Pennarun
2010-08-13 17:19 ` Jay Soffian [this message]
2010-08-15 2:24 ` David Aguilar
2010-08-15 6:59 ` Junio C Hamano
2010-08-15 16:00 ` Magnus Bäck
2010-08-17 9:22 ` [PATCH] mergetool: Skip autoresolved paths David Aguilar
2010-08-19 10:02 ` Thomas Rast
2010-08-20 3:52 ` David Aguilar
2010-08-20 9:57 ` Charles Bailey
2010-08-20 10:09 ` Jonathan Nieder
2010-08-20 11:17 ` [PATCH] mergetool: Remove explicit references to /dev/tty Charles Bailey
2010-08-20 12:27 ` Jonathan Nieder
2010-08-20 13:50 ` Charles Bailey
2010-08-20 14:19 ` Jonathan Nieder
2010-08-20 15:25 ` [PATCH v2] " Charles Bailey
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='AANLkTi=0dV54q6o3f-XrxKAHDKn8mhWFmsLDen_3+1G7@mail.gmail.com' \
--to=jaysoffian@gmail.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=magnus.back@sonyericsson.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).