undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,147 Commits 1 Branch 0 Tags 217 MiB
a9e643668a
Commit Graph

2 Commits

Author SHA1 Message Date
Avery Pennarun
ee2c79552a Teach git-pull to pass -X<option> to git-merge 
This needs the usual sq then eval trick to allow IFS characters
in the option.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-01-17 22:45:17 -08:00
Avery Pennarun
8cc5b29065 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>
 2010-01-17 22:45:06 -08:00