![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Thu, 26 Nov 2009 02:23:55 +0000 (21:23 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Jan 2010 06:45:06 +0000 (22:45 -0800) | ||
| commit | 8cc5b29065e19267cbc08b39c34674b02c2e3d59 | |
| tree | a7fc209fac5df7d2a9c9a5795fb4f58746ae3840 | tree | snapshot |
| parent | 73eb40eeaaebc5ebae283c06286b96b4aea00143 | commit | diff |
git merge -X<option>
Teach "-X <option>" command line argument to "git merge" that is passed to
strategy implementations. "ours" and "theirs" autoresolution introduced
by the previous commit can be asked to the recursive strategy.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Teach "-X <option>" command line argument to "git merge" that is passed to
strategy implementations. "ours" and "theirs" autoresolution introduced
by the previous commit can be asked to the recursive strategy.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge-recursive.c | diff | blob | history | |
| builtin-merge.c | diff | blob | history | |
| contrib/examples/git-merge.sh | diff | blob | history | |
| git-compat-util.h | diff | blob | history | |
| git.c | diff | blob | history | |
| ll-merge.c | diff | blob | history | |
| ll-merge.h | diff | blob | history | |
| merge-recursive.c | diff | blob | history | |
| merge-recursive.h | diff | blob | history | |
| strbuf.c | diff | blob | history | |
| t/t6037-merge-ours-theirs.sh | [new file with mode: 0755] | blob |