Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-mergetool.sh
Age
Commit message (
Expand
)
Author
2023-04-06
mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
Tao Klerks
2021-03-14
mergetool: do not enable hideResolved by default
Jonathan Nieder
2021-02-10
mergetool: add per-tool support and overrides for the hideResolved flag
Seth House
2021-02-10
mergetool: break setup_tool out into separate initialization function
Seth House
2021-02-10
mergetool: add hideResolved configuration
Seth House
2019-06-12
mergetool: use shell variable magic instead of `awk`
Johannes Sixt
2019-06-12
mergetool: dissect strings with shell variable magic instead of `expr`
Johannes Sixt
2019-05-13
mergetool: use get_merge_tool function
Denton Liu
2018-10-25
mergetool: accept -g/--[no-]gui as arguments
Denton Liu
2018-08-13
mergetool: don't suggest to continue after last file
Nicholas Guriev
2017-01-11
mergetool: fix running in subdir when rerere enabled
Richard Hansen
2017-01-11
mergetool: take the "-O" out of $orderfile
Richard Hansen
2016-10-11
mergetool: honor -O<orderfile>
David Aguilar
2016-10-11
mergetool: honor diff.orderFile
David Aguilar
2016-10-11
mergetool: move main program flow into a main() function
David Aguilar
2016-10-11
mergetool: add copyright
David Aguilar
2016-05-04
Merge branch 'nf/mergetool-prompt'
Junio C Hamano
2016-04-26
difftool/mergetool: make the form of yes/no questions consistent
Nikola Forró
2016-03-11
mergetool: honor tempfile configuration when resolving delete conflicts
David Aguilar
2016-03-11
mergetool: support delete/delete conflicts
David Aguilar
2015-05-20
mergetool--lib: set IFS for difftool and mergetool
David Aguilar
2014-11-21
mergetool: simplify conditionals
David Aguilar
2014-10-22
Merge branch 'da/mergetool-temporary-directory'
Junio C Hamano
2014-10-22
Merge branch 'da/mergetool-tool-help'
Junio C Hamano
2014-10-22
Merge branch 'da/mergetool-temporary-filename'
Junio C Hamano
2014-10-16
mergetool: add an option for writing to a temporary directory
David Aguilar
2014-10-16
mergetool: use more conservative temporary filenames
David Aguilar
2014-10-16
difftool: don't assume that default sh is sane
Charles Bailey
2014-10-16
mergetool: don't require a work tree for --tool-help
Charles Bailey
2014-10-16
mergetool: use more conservative temporary filenames
David Aguilar
2014-06-10
git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
Elia Pinto
2014-04-22
mergetool: run prompt only if guessed tool
Felipe Contreras
2013-02-14
Merge branch 'al/mergetool-printf-fix'
Junio C Hamano
2013-02-09
git-mergetool: print filename when it contains %
Asheesh Laroia
2013-01-25
git-mergetool: move show_tool_help to mergetool--lib
John Keeping
2012-08-24
mergetool: style fixes
Junio C Hamano
2012-07-24
mergetool: support --tool-help option like difftool does
Junio C Hamano
2012-01-23
mergetool: Provide an empty file when needed
David Aguilar
2011-10-11
Merge branch 'jm/mergetool-pathspec'
Junio C Hamano
2011-09-26
mergetool: no longer need to save standard input
Junio C Hamano
2011-09-26
mergetool: Use args as pathspec to unmerged files
Jonathon Mah
2011-09-20
git-mergetool: check return value from read
Jay Soffian
2011-07-02
mergetool: check return value from read
Junio C Hamano
2011-04-13
mergetool: Teach about submodules
Jonathon Mah
2011-02-17
mergetool: don't skip modify/remove conflicts
Martin von Zweigbergk
2010-09-03
Merge branch 'cb/maint-mergetool-no-tty'
Junio C Hamano
2010-08-21
mergetool: Remove explicit references to /dev/tty
Charles Bailey
2010-08-18
mergetool: Skip autoresolved paths
David Aguilar
2009-04-13
mergetool--lib: simplify API usage by removing more global variables
David Aguilar
2009-04-11
Fix misspelled mergetool.keepBackup
Ferry Huberts
[next]