Junio C Hamano committed over 19 years ago
git-quiltimport /bin/sh-ism fix
Francis Daly committed over 19 years ago
Bisect: Improve error message in "bisect_next_check".
Christian Couder committed over 19 years ago
Merge branch 'master' of git://repo.or.cz/git/mergetool.git
Junio C Hamano committed over 19 years ago
mergetool: Clean up description of files and prompts for merge resolutions
Theodore Ts'o committed over 19 years ago
Simon Hausmann committed over 19 years ago
mergetool: Make git-rm quiet when resolving a deleted file conflict
Theodore Ts'o committed over 19 years ago
mergetool: Add support for Apple Mac OS X's opendiff command
Theodore Ts'o committed over 19 years ago
mergetool: Fix abort command when resolving symlinks and deleted files
Theodore Ts'o committed over 19 years ago
mergetool: Remove spurious error message if merge.tool config option not set
Theodore Ts'o committed over 19 years ago
mergetool: factor out common code
Theodore Ts'o committed over 19 years ago
mergetool: portability fix: don't use reserved word function
Theodore Ts'o committed over 19 years ago
mergetool: portability fix: don't assume true is in /bin
Theodore Ts'o committed over 19 years ago
mergetool: Don't error out in the merge case where the local file is deleted
Theodore Ts'o committed over 19 years ago
mergetool: Replace use of "echo -n" with printf(1) to be more portable
Theodore Ts'o committed over 19 years ago
Fix minor formatting issue in man page for git-mergetool
Theodore Ts'o committed over 19 years ago
git-upload-pack: make sure we close unused pipe ends
H. Peter Anvin committed over 19 years ago
Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
Gerrit Pape committed over 19 years ago
Documentation/git-svnimport.txt: fix typo.
Gerrit Pape committed over 19 years ago
Documentation: unbreak user-manual.
Junio C Hamano committed over 19 years ago