Age | Commit message (Expand) | Author | Files | Lines |
2018-05-08 | merge: add merge.renames config setting | Ben Peart | 1 | -4/+7 |
2018-03-21 | Merge branch 'dp/merge-strategy-doc-fix' | Junio C Hamano | 1 | -1/+1 |
2018-03-19 | Documentation/merge-strategies: typofix | David Pursehouse | 1 | -1/+1 |
2017-11-27 | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 1 | -2/+3 |
2017-11-08 | diff: --ignore-cr-at-eol | Junio C Hamano | 1 | -2/+3 |
2017-09-25 | merge-strategies: avoid implying that "-s theirs" exists | Junio C Hamano | 1 | -1/+2 |
2016-02-22 | merge-strategies.txt: fix typo | Felipe Gonçalves Assis | 1 | -2/+2 |
2016-02-17 | merge-recursive: more consistent interface | Felipe Gonçalves Assis | 1 | -4/+6 |
2016-02-17 | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 1 | -0/+6 |
2014-03-25 | Merge branch 'rr/doc-merge-strategies' | Junio C Hamano | 1 | -2/+2 |
2014-03-17 | Documentation/merge-strategies: avoid hyphenated commands | Ramkumar Ramachandra | 1 | -2/+2 |
2014-02-11 | docs/merge-strategies: remove hyphen from mis-merges | Albert L. Lash, IV | 1 | -1/+1 |
2013-12-09 | Documentation: document pitfalls with 3-way merge | brian m. carlson | 1 | -0/+8 |
2013-04-05 | git-merge(1): document diff-algorithm option to merge-recursive | John Keeping | 1 | -0/+6 |
2012-09-08 | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 1 | -1/+2 |
2010-10-26 | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 1 | -0/+4 |
2010-10-26 | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 1 | -0/+22 |
2010-10-08 | Use angles for placeholders consistently | Štěpán Němec | 1 | -1/+1 |
2010-09-29 | merge-recursive: option to specify rename threshold | Kevin Ballard | 1 | -0/+4 |
2010-08-27 | merge-recursive: options to ignore whitespace changes | Justin Frankel | 1 | -0/+15 |
2010-08-26 | merge-recursive --patience | Justin Frankel | 1 | -0/+7 |
2010-08-06 | merge-recursive --renormalize | Jonathan Nieder | 1 | -0/+12 |
2010-01-17 | Document that merge strategies can now take their own options | Junio C Hamano | 1 | -1/+28 |
2009-11-15 | Documentation: clarify 'ours' merge strategy | Thomas Rast | 1 | -2/+3 |
2009-03-25 | Grammar fixes to "merge" and "patch-id" docs | Wincent Colaiuta | 1 | -7/+7 |
2008-03-19 | Documentation/git-merge: document subtree strategy. | Miklos Vajna | 1 | -0/+7 |
2005-12-08 | Documentation: recursive is the default strategy these days. | Junio C Hamano | 1 | -5/+5 |
2005-11-06 | Refactor merge strategies into separate includable file. | Jon Loeliger | 1 | -0/+35 |