Merge branch 'sp/maint-bash-completion-optim' into maint

diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 69e1ab750d99defc98f671317ae6ae65debd92b0..9f6f4831864a3112119bc7d7fec22aa7a72225e5 100644 (file)
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -70,6 +70,9 @@ OPTIONS
        Only consider tags matching the given pattern (can be used to avoid
        leaking private tags made from the repository).
 
+--always::
+       Show uniquely abbreviated commit object as fallback.
+
 EXAMPLES
 --------
 
@@ -142,4 +145,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite