projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d75a52) | patch
merge script: allow custom strategies
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:05:32 +0000 (02:05 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
commite69dccf8cd4576be804597b2960aa7d0020a65db
treef80eeb6691e0772ee317fafa2e9a6734769b46d7tree | snapshot
parent5d75a52b3a8870c3c1b27c5d791da5c9267e1fb5commit | diff
merge script: allow custom strategies

The idea comes from v1.6.1-rc1~294^2~7 (builtin-merge: allow using a
custom strategy, 2008-07-30).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/examples/git-merge.sh diff | blob | history
Git—the stupid content tracker