Merge branch 'jk/detect-truncated-zlib-input'

Junio C Hamano committed almost 8 years ago

Merge branch 'nd/config-split'

Junio C Hamano committed almost 8 years ago

format-patch: respect --stat in cover letter's diffstat

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

built-in rebase: reinstate `checkout -q` behavior where appropriate

Johannes Schindelin committed almost 8 years ago

rebase: prepare reset_head() for more flags

Johannes Schindelin committed almost 8 years ago

rebase: consolidate clean-up code before leaving reset_head()

Johannes Schindelin committed almost 8 years ago

refs: fix some exclude patterns being ignored

Rafael Ascensão committed almost 8 years ago

refs: show --exclude failure with --branches/tags/remotes=glob

Rafael Ascensão committed almost 8 years ago

fetch-pack: drop custom loose object cache

Jeff King committed almost 8 years ago

sha1-file: use loose object cache for quick existence check

Jeff King committed almost 8 years ago

object-store: provide helpers for loose_objects_cache

Jeff King committed almost 8 years ago

sha1-file: use an object_directory for the main object dir

Jeff King committed almost 8 years ago

handle alternates paths the same as the main object dir

Jeff King committed almost 8 years ago

sha1_file_name(): overwrite buffer instead of appending

Jeff King committed almost 8 years ago

rename "alternate_object_database" to "object_directory"

Jeff King committed almost 8 years ago

submodule--helper: prefer strip_suffix() to ends_with()

Jeff King committed almost 8 years ago

fsck: do not reuse child_process structs

Jeff King committed almost 8 years ago

apply --recount: allow "no-op hunks"

Johannes Schindelin committed almost 8 years ago

status: rebase and merge can be in progress at the same time

Johannes Schindelin committed almost 8 years ago

built-in rebase --skip/--abort: clean up stale .git/<name> files

Johannes Schindelin committed almost 8 years ago