Teach rebase the --no-ff option.

diff --git a/Makefile b/Makefile
index cdc58fed7809c41a5b85162a3738ccca15720ab0..7c616f8b0a1405b3e5950ec72dc464e1a76a15b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -335,7 +335,6 @@ SCRIPT_SH += git-merge-octopus.sh
 SCRIPT_SH += git-merge-one-file.sh
 SCRIPT_SH += git-merge-resolve.sh
 SCRIPT_SH += git-mergetool.sh
-SCRIPT_SH += git-notes.sh
 SCRIPT_SH += git-pull.sh
 SCRIPT_SH += git-quiltimport.sh
 SCRIPT_SH += git-rebase--interactive.sh
@@ -677,6 +676,7 @@ BUILTIN_OBJS += builtin/mktag.o
 BUILTIN_OBJS += builtin/mktree.o
 BUILTIN_OBJS += builtin/mv.o
 BUILTIN_OBJS += builtin/name-rev.o
+BUILTIN_OBJS += builtin/notes.o
 BUILTIN_OBJS += builtin/pack-objects.o
 BUILTIN_OBJS += builtin/pack-redundant.o
 BUILTIN_OBJS += builtin/pack-refs.o
@@ -2103,6 +2103,7 @@ check-docs::
                git-merge-octopus | git-merge-ours | git-merge-recursive | \
                git-merge-resolve | git-merge-subtree | \
                git-fsck-objects | git-init-db | \
+               git-remote-* | git-stage | \
                git-?*--?* ) continue ;; \
                esac ; \
                test -f "Documentation/$$v.txt" || \
@@ -2141,7 +2142,7 @@ check-docs::
                documented,gittutorial | \
                documented,gittutorial-2 | \
                documented,git-bisect-lk2009 | \
-               documented.git-remote-helpers | \
+               documented,git-remote-helpers | \
                documented,gitworkflows | \
                sentinel,not,matching,is,ok ) continue ;; \
                esac; \