Merge branch 'jc/maint-apply-report-offset' into maint

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 801aede6094e40b5bfb1f4c5d09393e7011f500e..26632414b2646ba80a17fa861d422a9c8c957810 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -107,7 +107,7 @@ how long records of conflicted merge you have not resolved are
 kept.  This defaults to 15 days.
 
 The optional configuration variable 'gc.packrefs' determines if
-'git gc' runs 'git pack-refs'. This can be set to "nobare" to enable
+'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable
 it within all non-bare repos or it can be set to a boolean value.
 This defaults to true.