aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
Commit message (Expand)AuthorAge
* difftool/mergetool: make the form of yes/no questions consistentNikola Forró2016-04-25
* mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar2015-05-20
* mergetool: simplify conditionalsDavid Aguilar2014-11-21
* Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-21
|\
| * mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-16
* | Merge branch 'da/mergetool-tool-help'Junio C Hamano2014-10-21
|\ \
| * | difftool: don't assume that default sh is saneCharles Bailey2014-10-15
| * | mergetool: don't require a work tree for --tool-helpCharles Bailey2014-10-15
| * | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-15
* | | Merge branch 'da/mergetool-temporary-filename'Junio C Hamano2014-10-21
|\ \ \ | | |/ | |/|
| * | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-16
| |/
* | git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
* | mergetool: run prompt only if guessed toolFelipe Contreras2014-04-22
|/
* Merge branch 'al/mergetool-printf-fix'Junio C Hamano2013-02-14
|\
| * git-mergetool: print filename when it contains %Asheesh Laroia2013-02-08
* | git-mergetool: move show_tool_help to mergetool--libJohn Keeping2013-01-25
|/
* mergetool: style fixesJunio C Hamano2012-08-23
* mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-23
* mergetool: Provide an empty file when neededDavid Aguilar2012-01-23
* Merge branch 'jm/mergetool-pathspec'Junio C Hamano2011-10-10
|\
| * mergetool: no longer need to save standard inputJunio C Hamano2011-09-26
| * mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-26
* | git-mergetool: check return value from readJay Soffian2011-09-19
* | mergetool: check return value from readJunio C Hamano2011-07-01
|/
* mergetool: Teach about submodulesJonathon Mah2011-04-13
* mergetool: don't skip modify/remove conflictsMartin von Zweigbergk2011-02-16
* Merge branch 'cb/maint-mergetool-no-tty'Junio C Hamano2010-09-03
|\
| * mergetool: Remove explicit references to /dev/ttyCharles Bailey2010-08-20
* | mergetool: Skip autoresolved pathsDavid Aguilar2010-08-17
|/
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-12
* Fix misspelled mergetool.keepBackupFerry Huberts2009-04-11
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-08
* mergetool: use $( ... ) instead of `backticks`David Aguilar2009-04-07
* difftool/mergetool: add diffuse as merge and diff toolSebastian Pipping2009-04-07
* git-mergetool: add new merge tool TortoiseMergeMarkus Heidelberg2009-04-07
* git-mergetool/difftool: make (g)vimdiff workable under WindowsMarkus Heidelberg2009-04-07
* Merge branch 'cb/mergetool'Junio C Hamano2009-02-05
|\
| * mergetool: fix running mergetool in sub-directoriesCharles Bailey2009-01-31
| * mergetool: respect autocrlf by using checkout-indexCharles Bailey2009-01-27
* | mergetool: Don't repeat merge tool candidatesJohannes Gilger2009-01-27
|/
* mergetool: put the cursor on the editable file for VimMarkus Heidelberg2009-01-18
* Merge branch 'cb/mergetool'Junio C Hamano2009-01-01
|\
| * mergetool: Don't keep temporary merge files unless told toCharles Bailey2008-12-12
| * mergetool: Add prompt to continue after failing to merge a fileCharles Bailey2008-12-12
| * Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-14
| * Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey2008-11-14
* | git-mergetool: properly handle "git mergetool -- filename"David Aguilar2008-12-19
|/
* Remove the use of '--' in merge program invocationPatrick Higgins2008-06-19
* mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth2008-05-11
* Teach git mergetool to use custom commands defined at config timeCharles Bailey2008-03-05
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 08:20:29 +0000