| Commit message (Expand) | Author | Age | Files | Lines |
* | merge: introduce merge.ff configuration variable | Junio C Hamano | 2011-05-06 | 1 | -0/+10 |
* | Merge branch 'jc/merge-sans-branch' | Junio C Hamano | 2011-04-01 | 1 | -0/+10 |
|\ |
|
| * | merge: merge with the default upstream branch without argument | Junio C Hamano | 2011-03-24 | 1 | -0/+10 |
* | | mergetool--lib: Add Beyond Compare 3 as a tool | Sebastian Schuberth | 2011-02-28 | 1 | -1/+1 |
* | | mergetool--lib: Sort tools alphabetically for easier lookup | Sebastian Schuberth | 2011-02-28 | 1 | -4/+4 |
|/ |
|
* | Fix typos in the documentation | Ralf Wildenhues | 2011-01-04 | 1 | -1/+1 |
* | Merge branch 'rr/fmt-merge-msg' | Junio C Hamano | 2010-09-29 | 1 | -2/+4 |
|\ |
|
| * | merge: Make 'merge.log' an integer or boolean option | Ramkumar Ramachandra | 2010-09-09 | 1 | -2/+4 |
* | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 1 | -0/+10 |
|/ |
|
* | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | 2009-10-28 | 1 | -1/+1 |
* | mergetool--lib: add support for araxis merge | David Aguilar | 2009-05-24 | 1 | -1/+1 |
* | difftool/mergetool: add diffuse as merge and diff tool | Sebastian Pipping | 2009-04-07 | 1 | -1/+1 |
* | git-mergetool: add new merge tool TortoiseMerge | Markus Heidelberg | 2009-04-07 | 1 | -1/+1 |
* | doc/merge-config: list ecmerge as a built-in merge tool | Markus Heidelberg | 2009-04-07 | 1 | -1/+2 |
* | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 | 1 | -6/+6 |
* | Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc | Junio C Hamano | 2008-11-26 | 1 | -3/+11 |
* | Fix some manual typos. | Ralf Wildenhues | 2008-09-12 | 1 | -1/+1 |
* | Documentation: typos / spelling fixes | Mike Ralphson | 2008-08-05 | 1 | -2/+2 |
* | add merge.renamelimit config option | Jeff King | 2008-05-03 | 1 | -0/+5 |
* | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable | SZEDER Gábor | 2008-04-12 | 1 | -1/+1 |
* | add 'merge.stat' config variable | SZEDER Gábor | 2008-04-12 | 1 | -0/+4 |
* | doc: moved merge.* config variables into separate merge-config.txt | SZEDER Gábor | 2008-04-12 | 1 | -0/+31 |