pull: introduce a pull.rebase option to enable --rebase

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index e51d7e60eb841d1a4832641543fbe13cefb6e35e..8f62d1abeeb9b80fd36aa8ea12120c640a98414e 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -324,6 +324,9 @@ top `/`;;
 Currently only the slash `/` is recognized as the "magic signature",
 but it is envisioned that we will support more types of magic in later
 versions of git.
++
+A pathspec with only a colon means "there is no pathspec". This form
+should not be combined with other pathspec.
 
 [[def_parent]]parent::
        A <<def_commit_object,commit object>> contains a (possibly empty) list