![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Dan Holmsand <holmsand@gmail.com> | |
| Mon, 20 Jun 2005 18:52:38 +0000 (20:52 +0200) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 20 Jun 2005 22:49:39 +0000 (15:49 -0700) | ||
| commit | c591412cc0aaf10890cdda4cf97a4fbc782d7d49 | |
| tree | c83883158003834315e2c2ba7e9a76430888f094 | tree | snapshot |
| parent | 800644c5cb3aad99a229a09112f42fa88b63c1c4 | commit | 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 <holmsand@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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>
| git-resolve-script | diff | blob | history |