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
2007-06-06
Fix typo in git-mergetool
Josh Triplett
2007-03-30
mergetool: Clean up description of files and prompts for merge resolutions
Theodore Ts'o
2007-03-29
mergetool: Make git-rm quiet when resolving a deleted file conflict
Theodore Ts'o
2007-03-29
mergetool: Add support for Apple Mac OS X's opendiff command
Theodore Ts'o
2007-03-29
mergetool: Fix abort command when resolving symlinks and deleted files
Theodore Ts'o
2007-03-29
mergetool: Remove spurious error message if merge.tool config option not set
Theodore Ts'o
2007-03-29
mergetool: factor out common code
Theodore Ts'o
2007-03-29
mergetool: portability fix: don't use reserved word function
Theodore Ts'o
2007-03-29
mergetool: portability fix: don't assume true is in /bin
Theodore Ts'o
2007-03-29
mergetool: Don't error out in the merge case where the local file is deleted
Theodore Ts'o
2007-03-29
mergetool: Replace use of "echo -n" with printf(1) to be more portable
Theodore Ts'o
2007-03-19
mergetool: print an appropriate warning if merge.tool is unknown
Theodore Ts'o
2007-03-19
mergetool: Add support for vimdiff.
James Bowes
2007-03-14
Add git-mergetool to run an appropriate merge conflict resolution program
Theodore Ts'o