Merge branch 'maint-1.6.0' into maint-1.6.1

Junio C Hamano committed over 17 years ago

mergetool--lib: simplify API usage by removing more global variables

David Aguilar committed over 17 years ago

State the effect of filter-branch on graft explicitly

Daniel Cheng (aka SDiZ) committed over 17 years ago

process_{tree,blob}: Remove useless xstrdup calls

Linus Torvalds committed over 17 years ago

t1301-shared-repo: fix forced modes test

Johannes Sixt committed over 17 years ago

git-add: introduce --edit (to edit the diff vs. the index)

Johannes Schindelin committed over 17 years ago

documentation: Makefile accounts for SHELL_PATH setting

Ben Walton committed over 17 years ago

Allow users to un-configure rename detection

Linus Torvalds committed over 17 years ago

Replace ",<,>,& with their respective XML entities in DAV requests

Mike Hommey committed over 17 years ago

git-svn: always initialize with core.autocrlf=false

Johannes Schindelin committed over 17 years ago

Update delta compression message to be less misleading

Dan McGee committed over 17 years ago

git-svn: Save init/clone --ignore-paths in config

Ben Jackson committed over 17 years ago

git-svn: Add per-svn-remote ignore-paths config

Ben Jackson committed over 17 years ago

git-svn: speed up blame command

Boris Byk committed over 17 years ago

git-svn: add fetch --parent option

Jason Merrill committed over 17 years ago

Fix misspelled mergetool.keepBackup

Ferry Huberts committed over 17 years ago

git-shell: Add 'git-upload-archive' to allowed commands.

Erik Broes committed over 17 years ago

Allow users to un-configure rename detection

Linus Torvalds committed over 17 years ago

gitk: Add a command to compare two strings of commits

Paul Mackerras committed over 17 years ago

add tests for remote groups

Jeff King committed over 17 years ago