Merge branch 'ss/blame-textconv-fake-working-tree'

Junio C Hamano committed almost 15 years ago

blame.c: Properly initialize strbuf after calling textconv_object(), again

Sebastian Schuberth committed about 15 years ago

fmt-merge-msg: package options into a structure

Junio C Hamano committed about 15 years ago

fmt-merge-msg: avoid early returns

Junio C Hamano committed about 15 years ago

refs DWIMmery: use the same rule for both "git fetch" and others

Junio C Hamano committed about 15 years ago

fetch: allow "git fetch $there v1.0" to fetch a tag

Junio C Hamano committed about 15 years ago

merge: notice local merging of tags and keep it unwrapped

Junio C Hamano committed about 15 years ago

pull: introduce a pull.rebase option to enable --rebase

Ævar Arnfjörð Bjarmason committed about 15 years ago

Merge branch 'ab/i18n-test-fix'

Junio C Hamano committed about 15 years ago

Merge branch 'sn/http-auth-with-netrc-fix'

Junio C Hamano committed about 15 years ago

Merge branch 'pw/p4-appledouble-fix'

Junio C Hamano committed about 15 years ago

remote: fix remote set-url usage

Felipe Contreras committed about 15 years ago

remote: fix set-branches usage

Junio C Hamano committed about 15 years ago

fsck: print progress

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

fsck: avoid reading every object twice

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

verify_packfile(): check as many object as possible in a pack

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

fsck: return error code when verify_pack() goes wrong

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

cast variable in call to free() in builtin/diff.c and submodule.c

Ævar Arnfjörð Bjarmason committed about 15 years ago

apply: get rid of useless x < 0 comparison on a size_t type

Ævar Arnfjörð Bjarmason committed about 15 years ago

git-p4: ignore apple filetype

Pete Wyckoff committed about 15 years ago