Custom low-level merge driver support.
Junio C Hamano committed over 19 years ago
Junio C Hamano committed over 19 years ago
Junio C Hamano committed over 19 years ago
Use const qualifier for 'sha1' parameter in delete_ref function
Carlos Rica committed over 19 years ago
Update draft release notes for 1.5.2 with accumulated changes.
Junio C Hamano committed over 19 years ago
Junio C Hamano committed over 19 years ago
Junio C Hamano committed over 19 years ago
Merge branch 'master' of git://repo.or.cz/git-gui
Junio C Hamano committed over 19 years ago
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
Junio C Hamano committed over 19 years ago
Merge branch 'jc/read-tree-df'
Junio C Hamano committed over 19 years ago
Add a demonstration/test of customized merge.
Junio C Hamano committed over 19 years ago
Allow specifying specialized merge-backend per path.
Junio C Hamano committed over 19 years ago
git-gui: Honor TCLTK_PATH if supplied
Junio C Hamano committed over 19 years ago
Revert "Allow wish interpreter to be defined with TCLTK_PATH"
Shawn O. Pearce committed over 19 years ago
git-svn: quiet some warnings when run only with --version/--help
Eric Wong committed over 19 years ago
git-svn: respect lower bound of -r/--revision when following parent
Eric Wong committed over 19 years ago
merge-recursive: separate out xdl_merge() interface.
Junio C Hamano committed over 19 years ago
Allow more than true/false to attributes.
Junio C Hamano committed over 19 years ago
Add --ignore-unmatch option to exit with zero status when no files are removed.
Steven Grimm committed over 19 years ago
Make sure quickfetch is not fooled with a previous, incomplete fetch.
Junio C Hamano committed over 19 years ago