提交 ddfff266 编写于 作者: J Junio C Hamano

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
...@@ -94,8 +94,8 @@ Updates in v1.5.0 since v1.4.4 series ...@@ -94,8 +94,8 @@ Updates in v1.5.0 since v1.4.4 series
entries for selected paths. entries for selected paths.
- git-update-index is much less visible. Many suggestions to - git-update-index is much less visible. Many suggestions to
use the command in git output and documentation have now been use the command in git output and documentation have now been
replaced by simpler commands such as "git add" or "git rm". replaced by simpler commands such as "git add" or "git rm".
* Repository layout and objects transfer * Repository layout and objects transfer
...@@ -291,12 +291,10 @@ Updates in v1.5.0 since v1.4.4 series ...@@ -291,12 +291,10 @@ Updates in v1.5.0 since v1.4.4 series
reset" to jump to arbitrary commit, while still keeping your reset" to jump to arbitrary commit, while still keeping your
HEAD detached. HEAD detached.
Going back to attached state (i.e. on a particular branch) by Remember that a detached state is volatile, i.e. it will be forgotten
"git checkout $branch" can lose the current stat you arrived as soon as you move away from it with the checkout or reset command,
in these ways, and "git checkout" refuses when the detached unless a branch is created from it as mentioned above. It is also
HEAD is not pointed by any existing ref (an existing branch, possible to rescue a lost detached state from the HEAD reflog.
a remote tracking branch or a tag). This safety can be
overridden with "git checkout -f $branch".
* Packed refs * Packed refs
...@@ -411,14 +409,14 @@ Updates in v1.5.0 since v1.4.4 series ...@@ -411,14 +409,14 @@ Updates in v1.5.0 since v1.4.4 series
* Foreign SCM interfaces * Foreign SCM interfaces
- git-svn now requires the Perl SVN:: libraries, the - git-svn now requires the Perl SVN:: libraries, the
command-line backend was too slow and limited. command-line backend was too slow and limited.
- the 'commit' subcommand of git-svn has been renamed to - the 'commit' subcommand of git-svn has been renamed to
'set-tree', and 'dcommit' is the recommended replacement for 'set-tree', and 'dcommit' is the recommended replacement for
day-to-day work. day-to-day work.
- git fast-import backend. - git fast-import backend.
* User support * User support
......
...@@ -145,6 +145,7 @@ sub format_one { ...@@ -145,6 +145,7 @@ sub format_one {
git-relink ancillarymanipulators git-relink ancillarymanipulators
git-repack ancillarymanipulators git-repack ancillarymanipulators
git-config ancillarymanipulators git-config ancillarymanipulators
git-remote ancillarymanipulators
git-request-pull foreignscminterface git-request-pull foreignscminterface
git-rerere ancillaryinterrogators git-rerere ancillaryinterrogators
git-reset mainporcelain git-reset mainporcelain
......
...@@ -3,7 +3,7 @@ git-fast-import(1) ...@@ -3,7 +3,7 @@ git-fast-import(1)
NAME NAME
---- ----
git-fast-import - Backend for fast Git data importers. git-fast-import - Backend for fast Git data importers
SYNOPSIS SYNOPSIS
......
...@@ -939,11 +939,14 @@ check-docs:: ...@@ -939,11 +939,14 @@ check-docs::
case "$$v" in \ case "$$v" in \
git-merge-octopus | git-merge-ours | git-merge-recursive | \ git-merge-octopus | git-merge-ours | git-merge-recursive | \
git-merge-resolve | git-merge-stupid | \ 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 ;; \ git-ssh-pull | git-ssh-push ) continue ;; \
esac ; \ esac ; \
test -f "Documentation/$$v.txt" || \ test -f "Documentation/$$v.txt" || \
echo "no doc: $$v"; \ 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 \ case "$$v" in \
git) ;; \ git) ;; \
*) echo "no link: $$v";; \ *) echo "no link: $$v";; \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册