Merge branch 'rl/am-3way-config'

Junio C Hamano committed over 11 years ago

Merge branch 'jc/ll-merge-expose-path'

Junio C Hamano committed over 11 years ago

Merge branch 'es/osx-header-pollutes-mask-macro'

Junio C Hamano committed over 11 years ago

Merge branch 'es/configure-getdelim'

Junio C Hamano committed over 11 years ago

Merge branch 'pt/pull-optparse'

Junio C Hamano committed over 11 years ago

Merge branch 'qn/blame-show-email'

Junio C Hamano committed over 11 years ago

Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'

Junio C Hamano committed over 11 years ago

Merge branch 'es/send-email-sendmail-alias'

Junio C Hamano committed over 11 years ago

Merge branch 'jc/apply-reject-noop-hunk'

Junio C Hamano committed over 11 years ago

fsck: support ignoring objects in `git fsck` via fsck.skiplist

Johannes Schindelin committed over 11 years ago

fsck: git receive-pack: support excluding objects from fsck'ing

Johannes Schindelin committed over 11 years ago

fsck: introduce `git fsck --connectivity-only`

Johannes Schindelin committed over 11 years ago

fsck: support demoting errors to warnings

Johannes Schindelin committed over 11 years ago

fsck: document the new receive.fsck.<msg-id> options

Johannes Schindelin committed over 11 years ago

fsck: allow upgrading fsck warnings to errors

Johannes Schindelin committed over 11 years ago

fsck: optionally ignore specific fsck issues completely

Johannes Schindelin committed over 11 years ago

fsck: disallow demoting grave fsck errors to warnings

Johannes Schindelin committed over 11 years ago

fsck: add a simple test for receive.fsck.<msg-id>

Johannes Schindelin committed over 11 years ago

fsck: make fsck_tag() warn-friendly

Johannes Schindelin committed over 11 years ago

fsck: handle multiple authors in commits specially

Johannes Schindelin committed over 11 years ago