Merge branch 'jc/maint-split-diff-metainfo'

Junio C Hamano committed almost 18 years ago

Merge branch 'sp/runtime-prefix'

Junio C Hamano committed almost 18 years ago

Merge branch 'jk/signal-cleanup'

Junio C Hamano committed almost 18 years ago

Merge branch 'jg/mergetool'

Junio C Hamano committed almost 18 years ago

Merge branch 'maint'

Junio C Hamano committed almost 18 years ago

Merge branch 'maint-1.6.0' into maint

Junio C Hamano committed almost 18 years ago

contrib/difftool: Don't repeat merge tool candidates

David Aguilar committed almost 18 years ago

contrib/difftool: add support for Kompare

Markus Heidelberg committed almost 18 years ago

http-push: refactor request url creation

Tay Ray Chuan committed almost 18 years ago

merge: fix out-of-bounds memory access

René Scharfe committed almost 18 years ago

mergetool: fix running mergetool in sub-directories

Charles Bailey committed almost 18 years ago

mergetool: Add a test for running mergetool in a sub-directory

Charles Bailey committed almost 18 years ago

t3412: clean up GIT_EDITOR usage

Thomas Rast committed almost 18 years ago

git-shortlog.txt: fix example about .mailmap

Michele Ballabio committed almost 18 years ago

git-cvsserver: run post-update hook *after* update.

Stefan Karpinski committed almost 18 years ago

Fix 'git diff --no-index' with a non-existing symlink target

Johannes Schindelin committed almost 18 years ago

gitweb: align comments to code

Giuseppe Bilotta committed almost 18 years ago

gitweb: webserver config for PATH_INFO

Giuseppe Bilotta committed almost 18 years ago

gitweb: make static files accessible with PATH_INFO

Giuseppe Bilotta committed almost 18 years ago

git-cvsserver: handle CVS 'noop' command.

Stefan Karpinski committed almost 18 years ago