From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2011 22:38:18 +0000 (-0700)
Subject: Merge commit 'v1.7.0' into jc/checkout-reflog-fix
X-Git-Tag: v1.7.6.1~19^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71ee7fd15457a0252c089420b5b66de266dcbd2f;p=git.git

Merge commit 'v1.7.0' into jc/checkout-reflog-fix

* commit 'v1.7.0': (4188 commits)
  Git 1.7.0
  Fix typo in 1.6.6.2 release notes
  Re-fix check-ref-format documentation mark-up
  archive documentation: attributes are taken from the tree by default
  Documentation: minor fixes to RelNotes-1.7.0
  bash: support 'git am's new '--continue' option
  filter-branch: Fix error message for --prune-empty --commit-filter
  am: switch --resolved to --continue
  Update draft release notes to 1.7.0 one more time
  Git 1.6.6.2
  t8003: check exit code of command and error message separately
  check-ref-format documentation: fix enumeration mark-up
  Documentation: quote braces in {upstream} notation
  t3902: Protect against OS X normalization
  blame: prevent a segv when -L given start > EOF
  git-push: document all the status flags used in the output
  Fix parsing of imap.preformattedHTML and imap.sslverify
  git-add documentation: Fix shell quoting example
  Revert "pack-objects: fix pack generation when using pack_size_limit"
  archive: simplify archive format guessing
  ...
---

71ee7fd15457a0252c089420b5b66de266dcbd2f