path: root/Documentation/merge-config.txt
AgeCommit message (Collapse)Author
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
Add p4merge to the set of built-in diff/merge tools, and update bash completion and documentation. Signed-off-by: Scott Chacon <> Signed-off-by: Junio C Hamano <>
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
Araxis merge is now a built-in diff/merge tool. This adds araxis to git-completion and updates the documentation to mention araxis. Signed-off-by: David Aguilar <> Signed-off-by: Junio C Hamano <>
2009-04-08difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping
This adds diffuse as a built-in merge tool. Signed-off-by: Sebastian Pipping <> Signed-off-by: David Aguilar <> Signed-off-by: Junio C Hamano <>
2009-04-08git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg
TortoiseMerge comes with TortoiseSVN or TortoiseGit for Windows. It can only be used as a merge tool with an existing base file. It cannot be used without a base nor as a diff tool. The documentation only mentions the slash '/' as command line option prefix, which refused to work, but the parser also accepts the dash '-' See Signed-off-by: Markus Heidelberg <> Signed-off-by: Junio C Hamano <>
2009-04-08doc/merge-config: list ecmerge as a built-in merge toolMarkus Heidelberg
Signed-off-by: Markus Heidelberg <> Signed-off-by: Junio C Hamano <>
2008-12-10Improve language in git-merge.txt and related docsRalf Wildenhues
Improve some minor language and format issues like hyphenation, phrases, spacing, word order, comma, attributes. Signed-off-by: Junio C Hamano <>
2008-11-26Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-docJunio C Hamano
* mm/maint-sort-config-doc: config.txt: alphabetize configuration sections Conflicts: Documentation/config.txt
2008-09-12Fix some manual typos.Ralf Wildenhues
Signed-off-by: Ralf Wildenhues <> Signed-off-by: Junio C Hamano <>
2008-08-06Documentation: typos / spelling fixesMike Ralphson
Signed-off-by: Mike Ralphson <> Signed-off-by: Junio C Hamano <>
2008-05-03add merge.renamelimit config optionJeff King
The point of rename limiting is to bound the amount of time we spend figuring out inexact renames. Currently we use a single value, diff.renamelimit, for all situations. However, it is probably the case that a user is willing to spend more time finding renames during a merge than they are while looking at git-log. This patch provides a way of setting those values separately (though for backwards compatibility, merge still falls back on the diff renamelimit). Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2008-04-13fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor
These are new synonyms to the '--(no-)summary' option and the 'merge.summary' config variable, but are consistent with the soon to be added 'merge --(no-)log' options. The 'merge.summary' config variable and '--(no-)summary' options are still accepted, but are advertised to be removed in the future. 'merge.log' takes precedence over 'merge.summary' if they are both set inconsistently. Update documentation and tests accordingly. Signed-off-by: SZEDER Gábor <> Signed-off-by: Junio C Hamano <>
2008-04-13add 'merge.stat' config variableSZEDER Gábor
This variable has the same effect, as 'merge.diffstat'. Also mention it in the documentation. Signed-off-by: SZEDER Gábor <> Signed-off-by: Junio C Hamano <>
2008-04-13doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor
Include the new file from config.txt and git-merge.txt. Signed-off-by: SZEDER Gábor <> Signed-off-by: Junio C Hamano <>