projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7610fa5) | patch
merge-recursive: expose merge options for builtin merge
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 26 Aug 2010 05:47:58 +0000 (00:47 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Aug 2010 16:05:02 +0000 (09:05 -0700)
commit635a7bb1d807390bedfc1147d2052e8423bcd1e0
tree317b28d6a3d042cb3a5e728f62751e905b076535tree | snapshot
parent7610fa57e63b0acc0a66717fc2d85755634db591commit | diff
merge-recursive: expose merge options for builtin merge

There are two very similar blocks of code that recognize options for
the "recursive" merge strategy.  Unify them.

No functional change intended.

Cc: Avery Pennarun <apenwarr@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-recursive.c diff | blob | history
builtin/merge.c diff | blob | history
merge-recursive.c diff | blob | history
merge-recursive.h diff | blob | history
Git—the stupid content tracker