From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 18:20:07 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.6.0-rc0~80
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/efc8a625e9b03e6f8ceed37ccd4b9167a7447e31?hp=-c

Sync with maint

* maint:
Git 2.4.8
---

efc8a625e9b03e6f8ceed37ccd4b9167a7447e31
diff --combined Documentation/git.txt
index 7eb89d5b45,5e0397a448..2795340fb2
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -46,11 -46,12 +46,12 @@@ Documentation for older releases are av
  * link:v2.5.0/git.html[documentation for release 2.5]
  
  * release notes for
-   link:RelNotes/2.5.0.txt[2.5],
+   link:RelNotes/2.5.0.txt[2.5].
  
- * link:v2.4.7/git.html[documentation for release 2.4.7]
+ * link:v2.4.8/git.html[documentation for release 2.4.8]
  
  * release notes for
+   link:RelNotes/2.4.8.txt[2.4.8],
    link:RelNotes/2.4.7.txt[2.4.7],
    link:RelNotes/2.4.6.txt[2.4.6],
    link:RelNotes/2.4.5.txt[2.4.5],
@@@ -780,7 -781,7 +781,7 @@@ The Git Repositor
  ~~~~~~~~~~~~~~~~~~
  These environment variables apply to 'all' core Git commands. Nb: it
  is worth noting that they may be used/overridden by SCMS sitting above
 -Git so take care if using Cogito etc.
 +Git so take care if using a foreign front-end.
  
  'GIT_INDEX_FILE'::
  	This environment allows the specification of an alternate
@@@ -1009,20 -1010,9 +1010,20 @@@ Unsetting the variable, or setting it t
  	Enables trace messages for all packets coming in or out of a
  	given program. This can help with debugging object negotiation
  	or other protocol issues. Tracing is turned off at a packet
 -	starting with "PACK".
 +	starting with "PACK" (but see 'GIT_TRACE_PACKFILE' below).
  	See 'GIT_TRACE' for available trace output options.
  
 +'GIT_TRACE_PACKFILE'::
 +	Enables tracing of packfiles sent or received by a
 +	given program. Unlike other trace output, this trace is
 +	verbatim: no headers, and no quoting of binary data. You almost
 +	certainly want to direct into a file (e.g.,
 +	`GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on
 +	the terminal or mixing it with other trace output.
 ++
 +Note that this is currently only implemented for the client side
 +of clones and fetches.
 +
  'GIT_TRACE_PERFORMANCE'::
  	Enables performance related trace messages, e.g. total execution
  	time of each Git command.
diff --combined GIT-VERSION-GEN
index fd6c6890b0,5cadf44e1a..fc45283501
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=v2.5.0
 +DEF_VER=v2.5.0.GIT
  
  LF='
  '
@@@ -38,5 -38,3 +38,3 @@@ test "$VN" = "$VC" || 
  	echo >&2 "GIT_VERSION = $VN"
  	echo "GIT_VERSION = $VN" >$GVF
  }
- 
-