Re: [PATCH v2] Allow to control where the replace refs are looked for
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 12, 2015, 22:29 UTC
- Message-ID
- <xmqqmw04blwm.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1434058499-15018-1-git-send-email-mh@glandium.org>
Mike Hommey <mh@glandium.org> writes:
Show 18 quoted lines
> It can be useful to have grafts or replace refs for specific use-cases while > keeping the default "view" of the repository pristine (or with a different > set of grafts/replace refs). > > It is possible to use a different graft file with GIT_GRAFT_FILE, but while > replace refs are more powerful, they don't have an equivalent override. > > Add a GIT_REPLACE_REF_BASE environment variable to control where git is > going to look for replace refs. > > Signed-off-by: Mike Hommey <mh@glandium.org> > --- > builtin/replace.c | 6 +++--- > cache.h | 2 ++ > environment.c | 6 ++++++ > log-tree.c | 5 +++-- > refs.c | 3 ++- > 5 files changed, 16 insertions(+), 6 deletions(-)
Thanks.
"git am" seems to be seeing a patch based on a stale base. What branch did you base this on?