git-shortlog: Fix two formatting errors in asciidoc documentation
Frank Lichtenheld committed over 19 years ago
Fix overwriting of files when applying contextually independent diffs
Alex Riesen committed over 19 years ago
git-svn: don't allow globs to match regular files
Eric Wong committed over 19 years ago
Allow low-level driver to specify different behaviour during internal merge.
Junio C Hamano committed over 19 years ago
Custom low-level merge driver: change the configuration scheme.
Junio C Hamano committed over 19 years ago
Allow the default low-level merge driver to be configured.
Junio C Hamano committed over 19 years ago
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