Sync with maint

Junio C Hamano committed over 14 years ago

Prepare for 1.7.9.1

Junio C Hamano committed over 14 years ago

completion: --edit and --no-edit for git-merge

Adrian Weimann committed almost 15 years ago

Merge branch 'sp/smart-http-failure-to-push' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'jc/maint-log-first-parent-pathspec' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'cb/push-quiet' into maint

Junio C Hamano committed over 14 years ago

Merge branch 'cb/maint-kill-subprocess-upon-signal' into maint

Junio C Hamano committed over 14 years ago

Sync with 1.7.6.6

Junio C Hamano committed over 14 years ago

Sync with 1.7.6.6

Junio C Hamano committed over 14 years ago

Sync with 1.7.6.6

Junio C Hamano committed over 14 years ago

Git 1.7.6.6

Junio C Hamano committed over 14 years ago

imap-send: remove dead code

Jeff King committed over 14 years ago

branch --edit-description: protect against mistyped branch name

Junio C Hamano committed almost 15 years ago

Drop system includes from inet_pton/inet_ntop compatibility wrappers

Ben Walton committed almost 15 years ago

merge: do not create a signed tag merge under --ff-only option

Junio C Hamano committed almost 15 years ago

Use correct grammar in diffstat summary line

Nguyễn Thái Ngọc Duy committed almost 15 years ago

parse_date(): '@' prefix forces git-timestamp

Junio C Hamano committed almost 15 years ago

parse_date(): allow ancient git-timestamp

Junio C Hamano committed almost 15 years ago

git.spec: Workaround localized messages not put in any RPM

Jakub Narebski committed almost 15 years ago

t0300: use write_script helper

Jeff King committed almost 15 years ago