From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2015 22:45:37 +0000 (-0700)
Subject: Merge branch 'as/docfix-reflog-expire-unreachable'
X-Git-Tag: v2.6.0-rc0~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cfcd38f5529a804ee7c377662aeb8384e94dc3ea

Merge branch 'as/docfix-reflog-expire-unreachable'

* as/docfix-reflog-expire-unreachable:
Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachable
---

cfcd38f5529a804ee7c377662aeb8384e94dc3ea
diff --cc Documentation/config.txt
index be557f4eea,d0405c4d3d..f5d15fff3e
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1329,12 -1256,10 +1329,12 @@@ gc.<pattern>.reflogExpire:
  	the refs that match the <pattern>.
  
  gc.reflogExpireUnreachable::
- gc.<ref>.reflogExpireUnreachable::
+ gc.<pattern>.reflogExpireUnreachable::
  	'git reflog expire' removes reflog entries older than
  	this time and are not reachable from the current tip;
 -	defaults to 30 days.  With "<pattern>" (e.g. "refs/stash")
 +	defaults to 30 days. The value "now" expires all entries
 +	immediately, and "never" suppresses expiration altogether.
 +	With "<pattern>" (e.g. "refs/stash")
  	in the middle, the setting applies only to the refs that
  	match the <pattern>.