From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Sep 2009 22:45:48 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5-rc0~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=df01e7c5ee732cd6673de18743b42bf5234a5c76;p=git.git

Merge branch 'maint'

* maint:
  git-pull: do not mention --quiet and --verbose twice
  githooks.txt: put hooks into subsections
---

df01e7c5ee732cd6673de18743b42bf5234a5c76
diff --cc Documentation/githooks.txt
index c308d2943,acc408d7e..79f633e83
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@@ -307,37 -310,8 +310,37 @@@ Both standard output and standard erro
  'git-send-pack' on the other end, so you can simply `echo` messages
  for the user.
  
 +post-upload-pack
 +----------------
 +
 +After upload-pack successfully finishes its operation, this hook is called
 +for logging purposes.
 +
 +The hook is passed various pieces of information, one per line, from its
 +standard input.  Currently the following items can be fed to the hook, but
 +more types of information may be added in the future:
 +
 +want SHA-1::
 +    40-byte hexadecimal object name the client asked to include in the
 +    resulting pack.  Can occur one or more times in the input.
 +
 +have SHA-1::
 +    40-byte hexadecimal object name the client asked to exclude from
 +    the resulting pack, claiming to have them already.  Can occur zero
 +    or more times in the input.
 +
 +time float::
 +    Number of seconds spent for creating the packfile.
 +
 +size decimal::
 +    Size of the resulting packfile in bytes.
 +
 +kind string:
 +    Either "clone" (when the client did not give us any "have", and asked
 +    for all our refs with "want"), or "fetch" (otherwise).
 +
  pre-auto-gc
- -----------
+ ~~~~~~~~~~~
  
  This hook is invoked by 'git-gc --auto'. It takes no parameter, and
  exiting with non-zero status from this script causes the 'git-gc --auto'