Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix

Junio C Hamano committed over 16 years ago

diff.c: fix a graph output bug

Bo Yang committed over 16 years ago

tests: Use skip_all=* to skip tests

Ævar Arnfjörð Bjarmason committed over 16 years ago

Fix "read-tree -m A B" priming the cache-tree

Junio C Hamano committed over 16 years ago

Reorganize `git-log' man page to clarify common diff options.

Eli Barzilay committed over 16 years ago

t9118 (git-svn): prevent early failure from taking down later tests

Jonathan Nieder committed over 16 years ago

t9118: avoid PEG revision identifier in tests

Michael J Gruber committed over 16 years ago

grep -O: Do not pass color sequences as filenames to pager

Nazri Ramliy committed over 16 years ago

Git 1.7.2-rc2

Junio C Hamano committed over 16 years ago

Merge branch 'ab/tap'

Junio C Hamano committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

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