]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 07924d4) | patch
git-merge(1): document diff-algorithm option to merge-recursive
authorJohn Keeping <john@keeping.me.uk>
Fri, 5 Apr 2013 11:37:30 +0000 (12:37 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Apr 2013 17:57:23 +0000 (10:57 -0700)
commit4db4f0fba43d7e9b9b87a3a40d85ffbdfcef2884
tree02b500e030471bbaddeebcee9d39ef0286f9ad51tree | snapshot
parent07924d4d50e5304fb53eb60aaba8aef31d4c4e5ecommit | diff
git-merge(1): document diff-algorithm option to merge-recursive

Commit 07924d4 (diff: Introduce --diff-algorithm command line option
2013-01-16) added diff-algorithm as a parameter to the recursive merge
strategy but did not document it.  Do so.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-strategies.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.