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 /.gitignore | |
| parent | Add --no-commit to git-merge/git-pull. (diff) | |
| download | tgif-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 '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 927c89cbac..3edf6b41af 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ git-merge-base git-merge-index git-merge-octopus git-merge-one-file +git-merge-ours git-merge-recursive git-merge-resolve git-merge-stupid |