index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-mergetool--lib.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2016-11-29
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
David Aguilar
1
-11
/
+45
2016-05-03
Merge branch 'nf/mergetool-prompt'
Junio C Hamano
1
-1
/
+1
2016-04-25
difftool/mergetool: make the form of yes/no questions consistent
Nikola Forró
1
-1
/
+1
2016-04-04
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
Jacob Nisnevich
1
-0
/
+25
2015-06-19
mergetool-lib: fix default tool selection
Michael J Gruber
1
-0
/
+1
2015-05-20
mergetool--lib: set IFS for difftool and mergetool
David Aguilar
1
-0
/
+3
2014-11-21
mergetool--lib: remove use of $status global
David Aguilar
1
-14
/
+5
2014-11-21
mergetool--lib: remove no-op assignment to $status from setup_user_tool
Junio C Hamano
1
-1
/
+0
2014-11-18
Merge branch 'da/difftool'
Junio C Hamano
1
-0
/
+1
2014-11-14
difftool: honor --trust-exit-code for builtin tools
David Aguilar
1
-0
/
+1
2014-10-21
mergetool: rename bc3 to bc
Junio C Hamano
1
-1
/
+1
2013-11-26
remove #!interpreter line from shell libraries
Jonathan Nieder
1
-2
/
+1
2013-10-14
mergetool--lib: Fix typo in the merge/difftool help
Stefan Saasen
1
-1
/
+1
2013-10-13
mergetools/diffmerge: support DiffMerge as a git mergetool
Stefan Saasen
1
-1
/
+2
2013-07-29
many small typofixes
Ondřej Bílka
1
-1
/
+1
2013-06-17
mergetool--lib: refactor {diff,merge}_cmd logic
John Keeping
1
-47
/
+35
2013-02-02
doc: generate a list of valid merge tools
David Aguilar
1
-1
/
+2
2013-02-02
mergetool--lib: list user configured tools in '--tool-help'
John Keeping
1
-1
/
+40
2013-02-02
mergetool--lib: add functions for finding available tools
David Aguilar
1
-36
/
+65
2013-01-29
mergetool--lib: improve the help text in guess_merge_tool()
David Aguilar
1
-1
/
+7
2013-01-29
mergetool--lib: simplify command expressions
David Aguilar
1
-23
/
+15
2013-01-28
mergetools: simplify how we handle "vim" and "defaults"
David Aguilar
1
-30
/
+31
2013-01-27
mergetool--lib: don't call "exit" in setup_tool
John Keeping
1
-3
/
+20
2013-01-27
mergetool--lib: improve show_tool_help() output
David Aguilar
1
-5
/
+21
2013-01-25
git-mergetool: don't hardcode 'mergetool' in show_tool_help
John Keeping
1
-2
/
+4
2013-01-25
git-mergetool: remove redundant assignment
John Keeping
1
-1
/
+0
2013-01-25
git-mergetool: move show_tool_help to mergetool--lib
John Keeping
1
-0
/
+37
2012-10-01
Merge branch 'da/mergetool-custom'
Junio C Hamano
1
-2
/
+38
2012-09-25
mergetool--lib: Allow custom commands to override built-ins
David Aguilar
1
-2
/
+38
2012-08-27
Merge branch 'da/difftool-updates'
Junio C Hamano
1
-1
/
+1
2012-08-10
Add Code Compare v2.80.4 as a merge / diff tool for Windows
Sebastian Schuberth
1
-1
/
+1
2012-07-23
mergetool: support --tool-help option like difftool does
Junio C Hamano
1
-1
/
+5
2011-09-19
Merge branch 'maint'
Junio C Hamano
1
-1
/
+1
2011-09-19
git-mergetool: check return value from read
Jay Soffian
1
-1
/
+1
2011-08-19
mergetool--lib: Refactor tools into separate files
David Aguilar
1
-333
/
+52
2011-08-19
mergetool--lib: Make style consistent with git
David Aguilar
1
-53
/
+100
2011-08-05
misc-sh: fix up whitespace in some other .sh files.
Jon Seymour
1
-3
/
+3
2011-06-29
Merge branch 'da/git-prefix-everywhere' into next
Junio C Hamano
1
-0
/
+7
2011-05-26
git-mergetool--lib: Make vimdiff retain the current directory
David Aguilar
1
-0
/
+7
2011-05-01
Pass empty file to p4merge where no base is suitable.
Ciaran Jessup
1
-6
/
+3
2011-03-19
Merge branch 'ss/mergetool--lib'
Junio C Hamano
1
-104
/
+121
2011-02-28
mergetool--lib: Add Beyond Compare 3 as a tool
Sebastian Schuberth
1
-2
/
+20
2011-02-28
mergetool--lib: Sort tools alphabetically for easier lookup
Sebastian Schuberth
1
-110
/
+109
2011-02-25
mergetool-lib: call vim in readonly mode for diffs
Michael J Gruber
1
-2
/
+2
2010-09-29
mergetool-lib: make the three-way diff the default for vim/gvim
Dan McGee
1
-3
/
+15
2010-09-15
mergetool-lib: add a three-way diff view for vim/gvim
Dan McGee
1
-2
/
+7
2010-09-15
mergetool-lib: combine vimdiff and gvimdiff run blocks
Dan McGee
1
-14
/
+3
2010-08-20
mergetool: Remove explicit references to /dev/tty
Charles Bailey
1
-1
/
+1
2010-01-29
add shebang line to git-mergetool--lib.sh
Jeff King
1
-0
/
+1
2009-11-25
Merge branch 'rs/work-around-grep-opt-insanity'
Junio C Hamano
1
-7
/
+6
[next]