From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Aug 2010 20:05:47 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc0~92
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f;p=git.git

Merge branch 'maint'

* maint:
  gitweb: clarify search results page when no matching commit found
  Documentation: add a FILES section for show-ref
  Makefile: add missing dependency on http.h
  Makefile: add missing dependencies on url.h
  Documentation/git-log: Clarify --full-diff
  git-rebase: fix typo when parsing --force-rebase
  imap-send: Fix sprintf usage
  prune: allow --dry-run for -n and --verbose for -v
  notes: allow --dry-run for -n and --verbose for -v
  Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C
  Documentation: cite git-am from git-apply
  t7003: fix subdirectory-filter test
  Allow "check-ref-format --branch" from subdirectory
  check-ref-format: handle subcommands in separate functions
  pretty-options.txt: match --format's documentation with implementation.
---

0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f