diff options
author | Mike Hommey <mh@glandium.org> | 2015-06-12 06:34:59 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-12 15:28:17 -0700 |
commit | 58d121b22b5b83a27a1891dcf335458f687cac1e (patch) | |
tree | c5172c1cc9376718074bf2c008655fbd970d0b7d /git-merge-resolve.sh | |
parent | Sixth batch for 2.5 cycle (diff) | |
download | tgif-58d121b22b5b83a27a1891dcf335458f687cac1e.tar.xz |
Allow to control where the replace refs are looked for
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions