]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 73eb40e) | patch
git merge -X<option>
authorAvery Pennarun <apenwarr@gmail.com>
Thu, 26 Nov 2009 02:23:55 +0000 (21:23 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jan 2010 06:45:06 +0000 (22:45 -0800)
commit8cc5b29065e19267cbc08b39c34674b02c2e3d59
treea7fc209fac5df7d2a9c9a5795fb4f58746ae3840tree | snapshot
parent73eb40eeaaebc5ebae283c06286b96b4aea00143commit | 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>
builtin-merge-recursive.c diff | blob | blame | history
builtin-merge.c diff | blob | blame | history
contrib/examples/git-merge.sh diff | blob | blame | history
git-compat-util.h diff | blob | blame | history
git.c diff | blob | blame | history
ll-merge.c diff | blob | blame | history
ll-merge.h diff | blob | blame | history
merge-recursive.c diff | blob | blame | history
merge-recursive.h diff | blob | blame | history
strbuf.c diff | blob | blame | history
t/t6037-merge-ours-theirs.sh [new file with mode: 0755] blob
Unnamed repository; edit this file 'description' to name the repository.