diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-01 19:34:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-03 14:55:10 -0800 |
| commit | 64da9e604eea25c9c20cfe12618285ccd0bf3cfe (patch) | |
| tree | 520ffc10b69b8bf3993f49c2d91685820e96b85d /git-merge.sh | |
| parent | 123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8 (diff) | |
| download | git-64da9e604eea25c9c20cfe12618285ccd0bf3cfe.tar.gz git-64da9e604eea25c9c20cfe12618285ccd0bf3cfe.tar.xz | |
Add 'ours' merge strategy.
This adds the coolest merge strategy ever, "ours". It can take
arbitrary number of foreign heads and merge them into the
current branch, with the resulting tree always taken from our
branch head, hence its name.
What this means is that you can declare that the current branch
supersedes the development histories of other branches using
this merge strategy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index dd104db7a..b810fceaf 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -14,7 +14,7 @@ usage () { # all_strategies='resolve recursive stupid octopus' -all_strategies='recursive octopus resolve stupid' +all_strategies='recursive octopus resolve stupid ours' default_strategies='resolve octopus' use_strategies= |