aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/merge-config.txt (follow)
AgeCommit message (Expand)AuthorFilesLines
2013-02-07Merge branch 'da/mergetool-docs'Junio C Hamano1-6/+6
2013-02-02doc: generate a list of valid merge toolsDavid Aguilar1-6/+6
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-4/+4
2012-10-25Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy1-2/+2
2011-05-06merge: introduce merge.ff configuration variableJunio C Hamano1-0/+10
2011-04-01Merge branch 'jc/merge-sans-branch'Junio C Hamano1-0/+10
2011-03-24merge: merge with the default upstream branch without argumentJunio C Hamano1-0/+10
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth1-1/+1
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth1-4/+4
2011-01-04Fix typos in the documentationRalf Wildenhues1-1/+1
2010-09-29Merge branch 'rr/fmt-merge-msg'Junio C Hamano1-2/+4
2010-09-09merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra1-2/+4
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen1-0/+10
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon1-1/+1
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar1-1/+1
2009-04-07difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping1-1/+1
2009-04-07git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg1-1/+1
2009-04-07doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg1-1/+2
2008-12-09Improve language in git-merge.txt and related docsRalf Wildenhues1-6/+6
2008-11-26Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-docJunio C Hamano1-3/+11
2008-09-12Fix some manual typos.Ralf Wildenhues1-1/+1
2008-08-05Documentation: typos / spelling fixesMike Ralphson1-2/+2
2008-05-03add merge.renamelimit config optionJeff King1-0/+5
2008-04-12fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor1-1/+1
2008-04-12add 'merge.stat' config variableSZEDER Gábor1-0/+4
2008-04-12doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor1-0/+31
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-10 19:37:27 +0000