From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Nov 2011 00:38:14 +0000 (-0800)
Subject: Sync with 1.7.7.3
X-Git-Tag: v1.7.8-rc2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de;p=git.git

Sync with 1.7.7.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de
diff --cc Documentation/diff-options.txt
index 08b581f04,66624a176..9f7cba2be
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -408,11 -408,8 +408,12 @@@ endif::git-format-patch[
  	Show the context between diff hunks, up to the specified number
  	of lines, thereby fusing hunks that are close to each other.
  
 +-W::
 +--function-context::
 +	Show whole surrounding functions of changes.
 +
  ifndef::git-format-patch[]
+ ifndef::git-log[]
  --exit-code::
  	Make the program exit with codes similar to diff(1).
  	That is, it exits with 1 if there were differences and