diff options
author | Junio C Hamano <junkio@cox.net> | 2005-09-11 04:56:19 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-09-11 05:30:41 +0400 |
commit | 2276aa6c098a0337bc2bec49742e332bdd1b802c (patch) | |
tree | bc43b357a46843c2efa0d1e3b4f55fe667b09824 /git-merge.sh | |
parent | 91063bbc6c4187184e94ebc4ab2b807e6d53cd0a (diff) |
Use Daniel's read-tree in the merge strategy 'resolve'.
And rename the one Linus kept calling stupid, 'stupid'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-x | git-merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge.sh b/git-merge.sh index 9926e45d1a1..55b0c7269e9 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -12,10 +12,10 @@ usage () { die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+" } -# all_strategies='resolve multibase fredrik octopus' +# all_strategies='resolve fredrik stupid octopus' -all_strategies='resolve multibase octopus' -default_strategies='resolve multibase octopus' +all_strategies='resolve octopus stupid' +default_strategies='resolve octopus' use_strategies= dropheads() { |