backmerge a few more fixes to 1.7.1.X series

Junio C Hamano committed over 16 years ago

Merge branch 'maint-1.6.4' into maint

Junio C Hamano committed over 16 years ago

rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option

Uwe Kleine-König committed over 16 years ago

Merge branch 'mg/doc-rev-parse-treepath-syntax' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'tr/receive-pack-aliased-update-fix' into maint

Junio C Hamano committed over 16 years ago

Implement automatic fast-forward merge for submodules

Heiko Voigt committed over 16 years ago

setup_revisions(): Allow walking history in a submodule

Heiko Voigt committed over 16 years ago

Teach ref iteration module about submodules

Heiko Voigt committed over 16 years ago

fix git branch -m in presence of cross devices

Pierre Habouzit committed over 16 years ago

t/t0006: specify timezone as EST5 not EST to comply with POSIX

Brandon Casey committed over 16 years ago

pack-refs: remove newly empty directories

Greg Price committed over 16 years ago

do not write out index when status does not have to

Junio C Hamano committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

add missing && to submodule-merge testcase

Heiko Voigt committed over 16 years ago

t/README: document more test helpers

Jonathan Nieder committed over 16 years ago

Makefile: work around ksh's failure to handle missing list argument to for loop

Brandon Casey committed over 16 years ago

test-date: fix sscanf type conversion

Jeff King committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

xdiff: optimise for no whitespace difference when ignoring whitespace.

Dylan Reid committed over 16 years ago

rebase-i: do not get fooled by a log message ending with backslash

Junio C Hamano committed over 16 years ago