Re: git-rerere: Usage question

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Mike Hommey schrieb:
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.
git-gc does -- at least if rerere.enabled is set.
Thanks for the pointer that this directory must exist.
Probably it gets auto-created when needed?
I didn't check that out coz I currently have nothing
to merge with :-(
A simple no-op "git pull" (Already up-to-date)
did *not* create the directory, but git-gc did.

   Dirk
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux