Merge branch 'master' into mk/rename

Junio C Hamano committed over 20 years ago

git-verify-pack: no need to count errors

Rene Scharfe committed over 20 years ago

git-verify-pack: buffer overrun paranoia

Rene Scharfe committed over 20 years ago

git-verify-pack: free pack after use and a cleanup

Rene Scharfe committed over 20 years ago

git-verify-pack: get rid of while loop

Rene Scharfe committed over 20 years ago

git-verify-pack: insist on .idx extension

Rene Scharfe committed over 20 years ago

git-verify-pack: more careful path handling

Rene Scharfe committed over 20 years ago

git-verify-pack: show usage when no pack was specified

Rene Scharfe committed over 20 years ago

Add has_extension()

Rene Scharfe committed over 20 years ago

builtin-apply: remove unused increment

Junio C Hamano committed over 20 years ago

Fix git-diff A...B

Junio C Hamano committed over 20 years ago

combine-diff: use color

Junio C Hamano committed over 20 years ago

git-apply: applying a patch to make a symlink shorter.

Junio C Hamano committed over 20 years ago

merge-recur: do not die unnecessarily

Johannes Schindelin committed over 20 years ago

merge-recur: try to merge older merge bases first

Johannes Schindelin committed over 20 years ago

merge-recur: if there is no common ancestor, fake empty one

Johannes Schindelin committed over 20 years ago

merge-recur: do not setenv("GIT_INDEX_FILE")

Johannes Schindelin committed over 20 years ago

merge-recur: do not call git-write-tree

Johannes Schindelin committed over 20 years ago

allow diff.renamelimit to be set regardless of -M/-C

Junio C Hamano committed over 20 years ago

← Newer Page 3801 of 4099 Older →