From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Feb 2007 06:48:32 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~293
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ddfff2665150f6194944864c96649cce08ac4fbd?ds=inline;hp=-c

Merge branch 'maint'

* 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
---

ddfff2665150f6194944864c96649cce08ac4fbd
diff --combined Documentation/cmd-list.perl
index d4fd72db4c,75f4791055..a2d6268e2b
--- a/Documentation/cmd-list.perl
+++ b/Documentation/cmd-list.perl
@@@ -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 d66126d7ec,dae2919965..ebecbbd9c2
--- a/Makefile
+++ 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 \
@@@ -291,7 -292,6 +291,7 @@@
  	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";; \