Junio C Hamano <gitster@xxxxxxxxx> writes: > Mike Hommey <mh@xxxxxxxxxxxx> writes: > >> 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@xxxxxxxxxxxx> >> --- >> 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? Ah, no need to resend; the conflict is with recently merged bc/object-id. Thanks. -- 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