summaryrefslogtreecommitdiff
path: root/gitenv.c
diff options
context:
space:
mode:
authorDan Holmsand <holmsand@gmail.com>2005-06-20 18:52:38 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-20 22:49:39 (GMT)
commitc591412cc0aaf10890cdda4cf97a4fbc782d7d49 (patch)
treec83883158003834315e2c2ba7e9a76430888f094 /gitenv.c
parent800644c5cb3aad99a229a09112f42fa88b63c1c4 (diff)
downloadgit-c591412cc0aaf10890cdda4cf97a4fbc782d7d49.zip
git-c591412cc0aaf10890cdda4cf97a4fbc782d7d49.tar.gz
git-c591412cc0aaf10890cdda4cf97a4fbc782d7d49.tar.bz2
[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse
Make git-resolve-script only write MERGE_HEAD if a merge actually occurred. All merge failures leave ORIG_HEAD and LAST_MERGE behind (instead of ORIG_HEAD and MERGE_HEAD). Use git-rev-parse to expand arguments (and check for bad ones). Signed-off-by: Dan Holmsand <holmsand@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'gitenv.c')
0 files changed, 0 insertions, 0 deletions