summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
Commit message (Expand)AuthorAgeFilesLines
* doc: change environment variables formatTom Russello2016-06-081-1/+1
* Merge branch 'sg/merge-summary-config'Junio C Hamano2015-06-161-5/+1
|\
| * Documentation: include 'merge.branchdesc' for merge and config as wellsg/merge-summary-configSZEDER Gábor2015-05-281-5/+1
* | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-131-1/+1
|/
* Merge branch 'da/mergetool-docs'Junio C Hamano2013-02-071-6/+6
|\
| * doc: generate a list of valid merge toolsDavid Aguilar2013-02-021-6/+6
* | Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-4/+4
* | Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy2012-10-251-2/+2
|/
* merge: introduce merge.ff configuration variableJunio C Hamano2011-05-061-0/+10
* Merge branch 'jc/merge-sans-branch'Junio C Hamano2011-04-011-0/+10
|\
| * merge: merge with the default upstream branch without argumentJunio C Hamano2011-03-241-0/+10
* | mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-281-1/+1
* | mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-281-4/+4
|/
* Fix typos in the documentationRalf Wildenhues2011-01-041-1/+1
* Merge branch 'rr/fmt-merge-msg'Junio C Hamano2010-09-291-2/+4
|\
| * merge: Make 'merge.log' an integer or boolean optionRamkumar Ramachandra2010-09-091-2/+4
* | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+10
|/
* mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-281-1/+1
* mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-241-1/+1
* difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-071-1/+1
* git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg2009-04-071-1/+1
* doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg2009-04-071-1/+2
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-091-6/+6
* Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-docJunio C Hamano2008-11-261-3/+11
* Fix some manual typos.Ralf Wildenhues2008-09-121-1/+1
* Documentation: typos / spelling fixesMike Ralphson2008-08-051-2/+2
* add merge.renamelimit config optionJeff King2008-05-031-0/+5
* fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-121-1/+1
* add 'merge.stat' config variableSZEDER Gábor2008-04-121-0/+4
* doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-121-0/+31
View Lorry Controller Status