Merge branch 'jk/blame-commit-label'

Junio C Hamano committed over 11 years ago

Merge branch 'ld/p4-submit-hint'

Junio C Hamano committed over 11 years ago

Merge branch 'ld/p4-exclude-in-sync'

Junio C Hamano committed over 11 years ago

git-p4: support excluding paths on sync

Luke Diamand committed over 11 years ago

Merge branch 'jc/coding-guidelines'

Junio C Hamano committed over 11 years ago

Merge branch 'ak/typofixes'

Junio C Hamano committed over 11 years ago

merge-file: correctly open files when in a subdir

Aleksander Boruch-Gruszecki committed over 11 years ago

apply: do not touch a file beyond a symbolic link

Junio C Hamano committed over 11 years ago

apply: do not read from beyond a symbolic link

Junio C Hamano committed over 11 years ago

apply: do not read from the filesystem under --index

Junio C Hamano committed over 11 years ago

apply: reject input that touches outside the working area

Junio C Hamano committed over 11 years ago

fast-import: avoid running end_packfile recursively

Jeff King committed over 11 years ago

builtin/blame: destroy initialized commit_info only

Eric Sunshine committed over 11 years ago

Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

Junio C Hamano committed over 11 years ago

Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check

Junio C Hamano committed over 11 years ago

sha1_file: fix iterating loose alternate objects

Jonathon Mah committed over 11 years ago

for_each_loose_file_in_objdir: take an optional strbuf path

Jeff King committed over 11 years ago

git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED

Kyle J. McKay committed over 11 years ago

Git 2.3

Junio C Hamano committed over 11 years ago

config_buf_ungetc: warn when pushing back a random character

Jeff King committed over 11 years ago