Merge branch 'js/merge-rr-fix'

Junio C Hamano committed over 16 years ago

Merge branch 'jc/diff-merge-base-multi'

Junio C Hamano committed over 16 years ago

Merge branch 'ns/merge-recursive-uptodate'

Junio C Hamano committed over 16 years ago

Merge branch 'jn/tests'

Junio C Hamano committed over 16 years ago

Merge branch 'eb/doc-log-manpage'

Junio C Hamano committed over 16 years ago

Merge branch 'jn/grep-open'

Junio C Hamano committed over 16 years ago

Merge branch 'mg/revision-doc'

Junio C Hamano committed over 16 years ago

Merge branch 'jk/maint-status-keep-index-timestamp'

Junio C Hamano committed over 16 years ago

Merge branch 'jc/rebase-i-commit-msg-fix'

Junio C Hamano committed over 16 years ago

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