Merge branch 'maint-1.6.1' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'tr/maint-1.6.0-send-email-irt' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'mg/maint-submodule-normalize-path' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'rs/memmem' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'js/rsync-local' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'db/maint-missing-origin' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint

Junio C Hamano committed over 17 years ago

Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1

Junio C Hamano committed over 17 years ago

Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1

Junio C Hamano committed over 17 years ago

format-patch: --numbered-files and --stdout aren't mutually exclusive

Stephen Boyd committed over 17 years ago

pack-objects: don't loosen objects available in alternate or kept packs

Brandon Casey committed over 17 years ago

Propagate --exec-path setting to external commands via GIT_EXEC_PATH

Johannes Sixt committed over 17 years ago

t7700: demonstrate repack flaw which may loosen objects unnecessarily

Brandon Casey committed over 17 years ago

git-branch: display "was sha1" on branch deletion rather than just "sha1"

Brandon Casey committed over 17 years ago

test-lib: Infrastructure to test and check for prerequisites

Johannes Sixt committed over 17 years ago

cvsimport: extend testcase about patchset order to contain branches

Heiko Voigt committed over 17 years ago

cvsimport: add test illustrating a bug in cvsps

Heiko Voigt committed over 17 years ago

Merge branch 'maint'

Shawn O. Pearce committed over 17 years ago

git-gui: Fix merge conflict display error when filename contains spaces

Jens Lehmann committed over 17 years ago

http tests: Darwin is not that special

Junio C Hamano committed over 17 years ago