diff options
| author | Dan Holmsand <holmsand@gmail.com> | 2005-06-20 20:52:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 15:49:39 -0700 |
| commit | c591412cc0aaf10890cdda4cf97a4fbc782d7d49 (patch) | |
| tree | c83883158003834315e2c2ba7e9a76430888f094 /delta.h | |
| parent | 800644c5cb3aad99a229a09112f42fa88b63c1c4 (diff) | |
| download | git-c591412cc0aaf10890cdda4cf97a4fbc782d7d49.tar.gz git-c591412cc0aaf10890cdda4cf97a4fbc782d7d49.tar.xz | |
[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 'delta.h')
0 files changed, 0 insertions, 0 deletions