git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 800644c)
[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse
authorDan Holmsand <redacted>
Mon, 20 Jun 2005 18:52:38 +0000 (20:52 +0200)
committerLinus Torvalds <redacted>
Mon, 20 Jun 2005 22:49:39 +0000 (15:49 -0700)
commitc591412cc0aaf10890cdda4cf97a4fbc782d7d49
treec83883158003834315e2c2ba7e9a76430888f094tree | snapshot
parent800644c5cb3aad99a229a09112f42fa88b63c1c4commit | diff
[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 <redacted>
Signed-off-by: Linus Torvalds <redacted>
git-resolve-script diff | blob | history
git clone https://git.99rst.org/PROJECT