summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
AgeCommit message (Expand)Author
2018-10-29config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy
2018-10-29config.txt: move fmt-merge-msg-config.txt to config/Nguyễn Thái Ngọc Duy
2018-05-08merge: add merge.renames config settingBen Peart
2018-05-08merge: update documentation for {merge,diff}.renameLimitBen Peart
2017-12-12merge: add config option for verifySignaturesHans Jerry Illikainen
2016-06-08doc: change environment variables formatTom Russello
2015-06-16Merge branch 'sg/merge-summary-config'Junio C Hamano
2015-05-28Documentation: include 'merge.branchdesc' for merge and config as wellSZEDER Gábor
2015-03-14*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy
2013-02-07Merge branch 'da/mergetool-docs'Junio C Hamano
2013-02-03doc: generate a list of valid merge toolsDavid Aguilar
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann
2012-10-25Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy
2011-05-06merge: introduce merge.ff configuration variableJunio C Hamano
2011-04-02Merge branch 'jc/merge-sans-branch'Junio C Hamano
2011-03-24merge: merge with the default upstream branch without argumentJunio C Hamano
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth
2011-01-04Fix typos in the documentationRalf Wildenhues
2010-09-29Merge branch 'rr/fmt-merge-msg'Junio C Hamano
2010-09-09merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
2009-04-08difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping
2009-04-08git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg
2009-04-08doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg
2008-12-10Improve language in git-merge.txt and related docsRalf Wildenhues
2008-11-26Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-docJunio C Hamano
2008-09-12Fix some manual typos.Ralf Wildenhues
2008-08-06Documentation: typos / spelling fixesMike Ralphson
2008-05-03add merge.renamelimit config optionJeff King
2008-04-13fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor
2008-04-13add 'merge.stat' config variableSZEDER Gábor
2008-04-13doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor