summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
AgeCommit message (Expand)Author
2014-11-21mergetool--lib: remove use of $status globalDavid Aguilar
2014-11-21mergetool--lib: remove no-op assignment to $status from setup_user_toolJunio C Hamano
2014-11-18Merge branch 'da/difftool'Junio C Hamano
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar
2014-10-21mergetool: rename bc3 to bcJunio C Hamano
2013-11-26remove #!interpreter line from shell librariesJonathan Nieder
2013-10-14mergetool--lib: Fix typo in the merge/difftool helpStefan Saasen
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen
2013-07-29many small typofixesOndřej Bílka
2013-06-17mergetool--lib: refactor {diff,merge}_cmd logicJohn Keeping
2013-02-03doc: generate a list of valid merge toolsDavid Aguilar
2013-02-03mergetool--lib: list user configured tools in '--tool-help'John Keeping
2013-02-03mergetool--lib: add functions for finding available toolsDavid Aguilar
2013-01-29mergetool--lib: improve the help text in guess_merge_tool()David Aguilar
2013-01-29mergetool--lib: simplify command expressionsDavid Aguilar
2013-01-29mergetools: simplify how we handle "vim" and "defaults"David Aguilar
2013-01-28mergetool--lib: don't call "exit" in setup_toolJohn Keeping
2013-01-28mergetool--lib: improve show_tool_help() outputDavid Aguilar
2013-01-25git-mergetool: don't hardcode 'mergetool' in show_tool_helpJohn Keeping
2013-01-25git-mergetool: remove redundant assignmentJohn Keeping
2013-01-25git-mergetool: move show_tool_help to mergetool--libJohn Keeping
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar
2012-08-27Merge branch 'da/difftool-updates'Junio C Hamano
2012-08-10Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth
2012-07-23mergetool: support --tool-help option like difftool doesJunio C Hamano
2011-09-20Merge branch 'maint'Junio C Hamano
2011-09-20git-mergetool: check return value from readJay Soffian
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar
2011-08-19mergetool--lib: Make style consistent with gitDavid Aguilar
2011-08-05misc-sh: fix up whitespace in some other .sh files.Jon Seymour
2011-06-30Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano
2011-05-26git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar
2011-05-01Pass empty file to p4merge where no base is suitable.Ciaran Jessup
2011-03-20Merge branch 'ss/mergetool--lib'Junio 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-02-25mergetool-lib: call vim in readonly mode for diffsMichael J Gruber
2010-09-29mergetool-lib: make the three-way diff the default for vim/gvimDan McGee
2010-09-15mergetool-lib: add a three-way diff view for vim/gvimDan McGee
2010-09-15mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey
2010-01-29add shebang line to git-mergetool--lib.shJeff King
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano
2009-11-23mergetool--lib: simplify guess_merge_tool()René Scharfe
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
2009-05-09mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar