Merge branch 'ab/submodule-add-f'

Junio C Hamano committed over 16 years ago

Merge branch 'bc/maint-makefile-fixes'

Junio C Hamano committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

Documentation: add submodule.* to the big configuration variable list

Jonathan Nieder committed over 16 years ago

gitmodules.5: url can be a relative path

Jonathan Nieder committed over 16 years ago

gitweb: fix esc_url

Pavan Kumar Sunkara committed over 16 years ago

git --paginate: paginate external commands again

Jonathan Nieder committed over 16 years ago

sha1_file: Show the the type and path to corrupt objects

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

MERGE_RR is in .git, not .git/rr-cache

Jay Soffian committed over 16 years ago

merge-tree: fix where two branches share no changes

Will Palmer committed over 16 years ago

add basic tests for merge-tree

Will Palmer committed over 16 years ago

Git 1.7.2-rc3

Junio C Hamano committed over 16 years ago

Merge branch 'jc/read-tree-cache-tree-fix'

Junio C Hamano committed over 16 years ago

rerere: fix overeager gc

SZEDER Gábor committed over 16 years ago

add configuration variable for --autosquash option of interactive rebase

Heiko Voigt committed over 16 years ago

Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()

Raja R Harinath committed over 16 years ago

Enable custom schemes for column colors in the graph API

Johan Herland committed over 16 years ago

Make graph_next_line() available in the graph.h API

Johan Herland committed over 16 years ago

diff A...B: give one possible diff when there are more than one merge-base

Junio C Hamano committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago