Merge branch 'maint-1.7.0' into maint-1.7.1

Junio C Hamano committed over 15 years ago

mergetool: don't skip modify/remove conflicts

Martin von Zweigbergk committed over 15 years ago

rerere "remaining"

Martin von Zweigbergk committed over 15 years ago

push.default: Rename 'tracking' to 'upstream'

Johan Herland committed over 15 years ago

parse_tag_buffer(): do not prefixcmp() out of range

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

git.c: reorder builtin command list

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

merge: honor prepare-commit-msg hook

Jay Soffian committed over 15 years ago

Make <identifier> lowercase as per CodingGuidelines

Michael J Gruber committed over 15 years ago

Make <identifier> lowercase as per CodingGuidelines

Michael J Gruber committed over 15 years ago

Make <identifier> lowercase as per CodingGuidelines

Michael J Gruber committed over 15 years ago

CodingGuidelines: downcase placeholders in usage messages

Junio C Hamano committed over 15 years ago

smart-http: Don't use Expect: 100-Continue

Shawn O. Pearce committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

pull: do not display fetch usage on --help-all

Michael J Gruber committed over 15 years ago

git-tag.txt: list all modes in the description

Michael J Gruber committed over 15 years ago

commit,status: describe -u likewise

Michael J Gruber committed over 15 years ago

add: describe --patch like checkout, reset

Michael J Gruber committed over 15 years ago

commit,merge,tag: describe -m likewise

Michael J Gruber committed over 15 years ago

clone,init: describe --template using the same wording

Michael J Gruber committed over 15 years ago

commit,status: describe --porcelain just like push

Michael J Gruber committed over 15 years ago