summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
AgeCommit message (Expand)AuthorFilesLines
2013-02-07Merge branch 'da/mergetool-docs'Libravatar Junio C Hamano1-6/+6
2013-02-02doc: generate a list of valid merge toolsLibravatar David Aguilar1-6/+6
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-4/+4
2012-10-25Documentation: remote tracking branch -> remote-tracking branchLibravatar Matthieu Moy1-2/+2
2011-05-06merge: introduce merge.ff configuration variableLibravatar Junio C Hamano1-0/+10
2011-04-01Merge branch 'jc/merge-sans-branch'Libravatar Junio C Hamano1-0/+10
2011-03-24merge: merge with the default upstream branch without argumentLibravatar Junio C Hamano1-0/+10
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolLibravatar Sebastian Schuberth1-1/+1
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupLibravatar Sebastian Schuberth1-4/+4
2011-01-04Fix typos in the documentationLibravatar Ralf Wildenhues1-1/+1
2010-09-29Merge branch 'rr/fmt-merge-msg'Libravatar Junio C Hamano1-2/+4
2010-09-09merge: Make 'merge.log' an integer or boolean optionLibravatar Ramkumar Ramachandra1-2/+4
2010-07-02Avoid conflicts when merging branches with mixed normalizationLibravatar Eyvind Bernhardsen1-0/+10
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionLibravatar Scott Chacon1-1/+1
2009-05-24mergetool--lib: add support for araxis mergeLibravatar David Aguilar1-1/+1
2009-04-07difftool/mergetool: add diffuse as merge and diff toolLibravatar Sebastian Pipping1-1/+1
2009-04-07git-mergetool: add new merge tool TortoiseMergeLibravatar Markus Heidelberg1-1/+1
2009-04-07doc/merge-config: list ecmerge as a built-in merge toolLibravatar Markus Heidelberg1-1/+2
2008-12-09Improve language in git-merge.txt and related docsLibravatar Ralf Wildenhues1-6/+6
2008-11-26Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-docLibravatar Junio C Hamano1-3/+11
2008-09-12Fix some manual typos.Libravatar Ralf Wildenhues1-1/+1
2008-08-05Documentation: typos / spelling fixesLibravatar Mike Ralphson1-2/+2
2008-05-03add merge.renamelimit config optionLibravatar Jeff King1-0/+5
2008-04-12fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableLibravatar SZEDER Gábor1-1/+1
2008-04-12add 'merge.stat' config variableLibravatar SZEDER Gábor1-0/+4
2008-04-12doc: moved merge.* config variables into separate merge-config.txtLibravatar SZEDER Gábor1-0/+31
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:38:38 +0000