aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
Commit message (Expand)AuthorAge
* Merge branch 'nf/mergetool-prompt'Junio C Hamano2016-05-03
|\
| * difftool/mergetool: make the form of yes/no questions consistentNikola Forró2016-04-25
* | mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich2016-04-04
|/
* mergetool-lib: fix default tool selectionMichael J Gruber2015-06-19
* mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar2015-05-20
* mergetool--lib: remove use of $status globalDavid Aguilar2014-11-21
* mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano2014-11-21
* Merge branch 'da/difftool'Junio C Hamano2014-11-18
|\
| * difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-14
* | mergetool: rename bc3 to bcJunio C Hamano2014-10-21
|/
* remove #!interpreter line from shell librariesJonathan Nieder2013-11-26
* mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen2013-10-14
* mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen2013-10-13
* many small typofixesOndřej Bílka2013-07-29
* mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping2013-06-17
* doc: generate a list of valid merge toolsDavid Aguilar2013-02-02
* mergetool--lib: list user configured tools in '--tool-help'John Keeping2013-02-02
* mergetool--lib: add functions for finding available toolsDavid Aguilar2013-02-02
* mergetool--lib: improve the help text in guess_merge_tool()David Aguilar2013-01-29
* mergetool--lib: simplify command expressionsDavid Aguilar2013-01-29
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-28
* mergetool--lib: don't call "exit" in setup_toolJohn Keeping2013-01-27
* mergetool--lib: improve show_tool_help() outputDavid Aguilar2013-01-27
* git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping2013-01-25
* git-mergetool: remove redundant assignmentJohn Keeping2013-01-25
* git-mergetool: move show_tool_help to mergetool--libJohn Keeping2013-01-25
* Merge branch 'da/mergetool-custom'Junio C Hamano2012-10-01
|\
| * mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-25
* | Merge branch 'da/difftool-updates'Junio C Hamano2012-08-27
|\ \ | |/ |/|
| * Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth2012-08-10
* | mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-23
|/
* Merge branch 'maint'Junio C Hamano2011-09-19
|\
| * git-mergetool: check return value from readJay Soffian2011-09-19
* | mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-19
* | mergetool--lib: Make style consistent with gitDavid Aguilar2011-08-19
* | misc-sh: fix up whitespace in some other .sh files.Jon Seymour2011-08-05
* | Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano2011-06-29
|\ \ | |/ |/|
| * git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar2011-05-26
* | Pass empty file to p4merge where no base is suitable.Ciaran Jessup2011-05-01
|/
* Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-19
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-28
| * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-28
* | mergetool-lib: call vim in readonly mode for diffsMichael J Gruber2011-02-25
|/
* mergetool-lib: make the three-way diff the default for vim/gvimDan McGee2010-09-29
* mergetool-lib: add a three-way diff view for vim/gvimDan McGee2010-09-15
* mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee2010-09-15
* mergetool: Remove explicit references to /dev/ttyCharles Bailey2010-08-20
* add shebang line to git-mergetool--lib.shJeff King2010-01-29
* Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-25
|\
| * mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-23