| commit | 64da9e604eea25c9c20cfe12618285ccd0bf3cfe | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Tue Nov 01 19:34:49 2005 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Thu Nov 03 14:55:10 2005 -0800 |
| tree | 520ffc10b69b8bf3993f49c2d91685820e96b85d | |
| parent | 123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8 [diff] |
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>