development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 12:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge script: allow custom strategies

Browse source 
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>
This commit is contained in:
Jonathan Nieder 2010-08-17 02:05:32 -05:00 committed by Junio C Hamano
parent 5d75a52b3a
commit e69dccf8cd
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
contrib/examples/git-merge.sh
View file

@ -193,9 +193,13 @@ parse_config () {
shift
case " $all_strategies " in
*" $1 "*)
use_strategies="$use_strategies$1 " ;;
use_strategies="$use_strategies$1 "
;;
*)
die "available strategies are: $all_strategies" ;;
type "git-merge-$1" >/dev/null 2>&1 ||
die "available strategies are: $all_strategies"
use_strategies="$use_strategies$1 "
;;
esac
;;
-X)