Merge branch 'ef/maint-empty-commit-log' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'jc/conflict-marker-size' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'mg/maint-send-email-lazy-editor' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'rr/imap-send-unconfuse-from-line' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'rb/maint-python-path' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'gh/maint-stash-show-error-message' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'mg/mailmap-update' into maint

Junio C Hamano committed over 16 years ago

Merge branch 'bc/maint-daemon-sans-ss-family' into maint

Junio C Hamano committed over 16 years ago

fetch/push: fix usage strings

Tay Ray Chuan committed over 16 years ago

remote-curl: ensure that URLs have a trailing slash

Tay Ray Chuan committed over 16 years ago

http: make end_url_with_slash() public

Tay Ray Chuan committed over 16 years ago

t5541-http-push: add test for URLs with trailing slash

Tay Ray Chuan committed over 16 years ago

Makefile: Simplify handling of python scripts

Brian Gernhardt committed over 16 years ago

Merge branch 'rc/maint-reflog-msg-for-forced-branch'

Junio C Hamano committed over 16 years ago

branch: say "Reset to" in reflog entries for 'git branch -f' operations

Tay Ray Chuan committed over 16 years ago

Merge early parts of jk/cached-textconv

Junio C Hamano committed over 16 years ago

diff.c: work around pointer constness warnings

Junio C Hamano committed over 16 years ago

Merge branch 'maint'

Junio C Hamano committed over 16 years ago

log.decorate: only ignore it under "log --pretty=raw"

Junio C Hamano committed over 16 years ago