Merge branch 'maint-1.7.7' into maint

Junio C Hamano committed almost 15 years ago

Merge branch 'maint-1.7.6' into maint-1.7.7

Junio C Hamano committed almost 15 years ago

Documentation: rerere.enabled is the primary way to configure rerere

Thomas Rast committed almost 15 years ago

write_head_info(): handle "extra refs" locally

Michael Haggerty committed almost 15 years ago

show_ref(): remove unused "flag" and "cb_data" arguments

Michael Haggerty committed almost 15 years ago

receive-pack: move more work into write_head_info()

Michael Haggerty committed almost 15 years ago

xdiff: print post-image for common records instead of pre-image

René Scharfe committed almost 15 years ago

parse_object: try internal cache before reading object db

Jeff King committed almost 15 years ago

gitweb: Harden "grep" search against filenames with ':'

Jakub Narebski committed almost 15 years ago

gitweb: Fix file links in "grep" search

Jakub Narebski committed almost 15 years ago

log --show-signature: reword the common two-head merge case

Junio C Hamano committed almost 15 years ago

log-tree: show mergetag in log --show-signature output

Junio C Hamano committed almost 15 years ago

log-tree.c: small refactor in show_signature()

Junio C Hamano committed almost 15 years ago

commit --amend -S: strip existing gpgsig headers

Junio C Hamano committed almost 15 years ago

verify_signed_buffer: fix stale comment

Junio C Hamano committed almost 15 years ago

Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'

Junio C Hamano committed almost 15 years ago

Merge branch 'maint'

Junio C Hamano committed almost 15 years ago

t5550: repack everything into one file

Clemens Buchacher committed almost 15 years ago

gitweb: accept trailing "/" in $project_list

Matthieu Moy committed almost 15 years ago

Merge branch 'nd/maint-parse-depth' into maint

Junio C Hamano committed almost 15 years ago