From: Mike Hommey <mh@glandium.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Dirk Süsserott" <newsletter@dirk.my1.cc>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: git-rerere: Usage question
Date: Sat, 24 May 2008 09:54:36 +0200 [thread overview]
Message-ID: <20080524075436.GA4377@glandium.org> (raw)
In-Reply-To: <7vwslkpo1o.fsf@gitster.siamese.dyndns.org>
On Fri, May 23, 2008 at 05:02:11PM -0700, Junio C Hamano wrote:
> These days, rerere is pretty much automatic in that rerere is called
> automatically from places that generate conflicts (e.g. "git merge") for
> purpose of (1), and from places that the user tells git that the conflicts
> are now resolved (e.g. "git commit") for purpose of (2).
Note that it is not totally automatic for most people because the
default is to enable only if the .git/rr_cache directory exists, and
neither git init nor git clone create this directory.
You still have to set rerere.enabled yourself.
Mike
next prev parent reply other threads:[~2008-05-24 7:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-23 14:27 git-rerere: Usage question Dirk Süsserott
2008-05-24 0:02 ` Junio C Hamano
2008-05-24 7:54 ` Mike Hommey [this message]
2008-05-24 12:06 ` Dirk Süsserott
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=20080524075436.GA4377@glandium.org \
--to=mh@glandium.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newsletter@dirk.my1.cc \
/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 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 NNTP newsgroup(s).