Merge branch 'mh/reflog-expire'

Junio C Hamano committed over 11 years ago

Merge branch 'cj/log-invert-grep'

Junio C Hamano committed over 11 years ago

Merge branch 'km/gettext-n'

Junio C Hamano committed over 11 years ago

Merge branch 'bc/http-fallback-to-password-after-krb-fails'

Junio C Hamano committed over 11 years ago

Merge branch 'dk/format-patch-ignore-diff-submodule'

Junio C Hamano committed over 11 years ago

Merge branch 'jn/rerere-fail-on-auto-update-failure'

Junio C Hamano committed over 11 years ago

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