Sync with 1.7.7.3

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

diff --cc Documentation/Makefile
Simple merge

diff --cc Documentation/diff-options.txt
index 08b581f040859d39aeaad8294bc7a3e7760ab0b9,66624a17698ac91cfcd6d45d1af6024c4bf066d9..9f7cba2be6a97cb85072d22b3317d37d1afe80bf
--- 1/Documentation/diff-options.txt
--- 2/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