Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 06:48:32 +0000 (22:48 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 06:48:32 +0000 (22:48 -0800)
* maint:
Makefile: update check-docs target
cmd-list: add git-remote
Documentation: Drop full-stop from git-fast-import title.
Minor corrections to release notes

1  2 
Documentation/cmd-list.perl
Makefile
index d4fd72db4c90c5106ec5cc829a06b3f845388ef2,75f47910557ebd3e22afce527214892c4dfe15f2..a2d6268e2b4b099b0b080d381ada189ffda592fa
@@@ -90,6 -90,7 +90,6 @@@ git-describ
  git-diff-files                          plumbinginterrogators
  git-diff-index                          plumbinginterrogators
  git-diff                                mainporcelain
 -git-diff-stages                         plumbinginterrogators
  git-diff-tree                           plumbinginterrogators
  git-fast-import                               ancillarymanipulators
  git-fetch                               mainporcelain
@@@ -145,9 -146,11 +145,10 @@@ git-reflo
  git-relink                              ancillarymanipulators
  git-repack                              ancillarymanipulators
  git-config                              ancillarymanipulators
+ git-remote                              ancillarymanipulators
  git-request-pull                        foreignscminterface
  git-rerere                              ancillaryinterrogators
  git-reset                               mainporcelain
 -git-resolve                             mainporcelain
  git-revert                              mainporcelain
  git-rev-list                            plumbinginterrogators
  git-rev-parse                           ancillaryinterrogators
diff --combined Makefile
index d66126d7ecce3b032e106342c46322e4cdcc3973,dae29199655455abb4fa960ce4fb5d12ee469e9a..ebecbbd9c28390654ed9fea2ff4ebf6a5a317c70
+++ b/Makefile
@@@ -172,7 -172,7 +172,7 @@@ SCRIPT_SH = 
        git-merge-one-file.sh git-parse-remote.sh \
        git-pull.sh git-rebase.sh \
        git-repack.sh git-request-pull.sh git-reset.sh \
 -      git-resolve.sh git-revert.sh git-sh-setup.sh \
 +      git-revert.sh git-sh-setup.sh \
        git-tag.sh git-verify-tag.sh \
        git-applymbox.sh git-applypatch.sh git-am.sh \
        git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
@@@ -280,6 -280,7 +280,6 @@@ BUILTIN_OBJS = 
        builtin-diff.o \
        builtin-diff-files.o \
        builtin-diff-index.o \
 -      builtin-diff-stages.o \
        builtin-diff-tree.o \
        builtin-fmt-merge-msg.o \
        builtin-for-each-ref.o \
        builtin-ls-tree.o \
        builtin-mailinfo.o \
        builtin-mailsplit.o \
 +      builtin-merge-base.o \
        builtin-merge-file.o \
        builtin-mv.o \
        builtin-name-rev.o \
@@@ -939,11 -939,14 +939,14 @@@ check-docs:
                case "$$v" in \
                git-merge-octopus | git-merge-ours | git-merge-recursive | \
                git-merge-resolve | git-merge-stupid | \
+               git-add--interactive | git-fsck-objects | git-init-db | \
+               git-repo-config | \
                git-ssh-pull | git-ssh-push ) continue ;; \
                esac ; \
                test -f "Documentation/$$v.txt" || \
                echo "no doc: $$v"; \
-               grep -q "^gitlink:$$v\[[0-9]\]::" Documentation/git.txt || \
+               sed -e '1,/^__DATA__/d' Documentation/cmd-list.perl | \
+               grep -q "^$$v[  ]" || \
                case "$$v" in \
                git) ;; \
                *) echo "no link: $$v";; \