summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool: accept -g/--[no-]gui as argumentsDenton Liu2018-10-251-5/+11
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-11/+45
* Merge branch 'nf/mergetool-prompt'Junio C Hamano2016-05-031-1/+1
|\
| * difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-251-1/+1
* | mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich2016-04-041-0/+25
|/
* mergetool-lib: fix default tool selectionda/mergetool-winmergeMichael J Gruber2015-06-191-0/+1
* mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar2015-05-201-0/+3
* mergetool--lib: remove use of $status globalDavid Aguilar2014-11-211-14/+5
* mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano2014-11-211-1/+0
* Merge branch 'da/difftool'Junio C Hamano2014-11-181-0/+1
|\
| * difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-141-0/+1
* | mergetool: rename bc3 to bcoc/mergetools-beyondcompareJunio C Hamano2014-10-211-1/+1
|/
* remove #!interpreter line from shell librariesjn/scripts-updatesJonathan Nieder2013-11-261-2/+1
* mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen2013-10-141-1/+1
* mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen2013-10-131-1/+2
* many small typofixesob/typofixesOndřej Bílka2013-07-291-1/+1
* mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping2013-06-171-47/+35
* doc: generate a list of valid merge toolsDavid Aguilar2013-02-021-1/+2
* mergetool--lib: list user configured tools in '--tool-help'John Keeping2013-02-021-1/+40
* mergetool--lib: add functions for finding available toolsDavid Aguilar2013-02-021-36/+65
* mergetool--lib: improve the help text in guess_merge_tool()David Aguilar2013-01-291-1/+7
* mergetool--lib: simplify command expressionsDavid Aguilar2013-01-291-23/+15
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-281-30/+31
* mergetool--lib: don't call "exit" in setup_toolJohn Keeping2013-01-271-3/+20
* mergetool--lib: improve show_tool_help() outputDavid Aguilar2013-01-271-5/+21
* git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping2013-01-251-2/+4
* git-mergetool: remove redundant assignmentJohn Keeping2013-01-251-1/+0
* git-mergetool: move show_tool_help to mergetool--libJohn Keeping2013-01-251-0/+37
* Merge branch 'da/mergetool-custom'Junio C Hamano2012-10-011-2/+38
|\
| * mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-251-2/+38
* | Merge branch 'da/difftool-updates'Junio C Hamano2012-08-271-1/+1
|\ \ | |/ |/|
| * Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth2012-08-101-1/+1
* | mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-231-1/+5
|/
* Merge branch 'maint'Junio C Hamano2011-09-191-1/+1
|\
| * git-mergetool: check return value from readJay Soffian2011-09-191-1/+1
* | mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-333/+52
* | mergetool--lib: Make style consistent with gitDavid Aguilar2011-08-191-53/+100
* | misc-sh: fix up whitespace in some other .sh files.Jon Seymour2011-08-051-3/+3
* | Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano2011-06-291-0/+7
|\ \ | |/ |/|
| * git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar2011-05-261-0/+7
* | Pass empty file to p4merge where no base is suitable.Ciaran Jessup2011-05-011-6/+3
|/
* Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-191-104/+121
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-281-2/+20
| * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-281-110/+109
* | mergetool-lib: call vim in readonly mode for diffsMichael J Gruber2011-02-251-2/+2
|/
* mergetool-lib: make the three-way diff the default for vim/gvimDan McGee2010-09-291-3/+15
* mergetool-lib: add a three-way diff view for vim/gvimDan McGee2010-09-151-2/+7
* mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee2010-09-151-14/+3
* mergetool: Remove explicit references to /dev/ttyCharles Bailey2010-08-201-1/+1
* add shebang line to git-mergetool--lib.shJeff King2010-01-291-0/+1
View Lorry Controller Status