Merge git://git.kernel.org/pub/scm/gitk/gitk

Junio C Hamano committed over 16 years ago

SubmittingPatches: Add new section about what to base work on

Ramkumar Ramachandra committed over 16 years ago

stash: Don't overwrite files that have gone from the index

Charles Bailey committed over 16 years ago

Documentation/remote-helpers: Fix typos and improve language

Ramkumar Ramachandra committed over 16 years ago

Fixup: Second argument may be any arbitrary string

Ramkumar Ramachandra committed over 16 years ago

Documentation/remote-helpers: Add invocation section

Ramkumar Ramachandra committed over 16 years ago

Documentation/urls: Rewrite to accomodate <transport>::<address>

Ramkumar Ramachandra committed over 16 years ago

Documentation/remote-helpers: Rewrite description

Ramkumar Ramachandra committed over 16 years ago

Documentation: Describe other situations where -z affects git diff

Charles Bailey committed over 16 years ago

rebase-interactive: silence warning when no commits rewritten

Jeff King committed over 16 years ago

t3301: add tests to use --format="%N"

Junio C Hamano committed over 16 years ago

reflog --expire-unreachable: special case entries in "HEAD" reflog

Junio C Hamano committed over 16 years ago

more war on "sleep" in tests

Junio C Hamano committed over 16 years ago

http.c: Don't store destination name in request structures

Shawn O. Pearce committed over 16 years ago

http.c: Drop useless != NULL test in finish_http_pack_request

Shawn O. Pearce committed over 16 years ago

http.c: Tiny refactoring of finish_http_pack_request

Shawn O. Pearce committed over 16 years ago

t5550-http-fetch: Use subshell for repository operations

Shawn O. Pearce committed over 16 years ago

http.c: Remove bad free of static block

Shawn O. Pearce committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

t6006: do not write to /tmp

Matthew Ogilvie committed over 16 years ago