mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
ddfff26651
|
@ -94,8 +94,8 @@ Updates in v1.5.0 since v1.4.4 series
|
|||
entries for selected paths.
|
||||
|
||||
- git-update-index is much less visible. Many suggestions to
|
||||
use the command in git output and documentation have now been
|
||||
replaced by simpler commands such as "git add" or "git rm".
|
||||
use the command in git output and documentation have now been
|
||||
replaced by simpler commands such as "git add" or "git rm".
|
||||
|
||||
|
||||
* Repository layout and objects transfer
|
||||
|
@ -291,12 +291,10 @@ Updates in v1.5.0 since v1.4.4 series
|
|||
reset" to jump to arbitrary commit, while still keeping your
|
||||
HEAD detached.
|
||||
|
||||
Going back to attached state (i.e. on a particular branch) by
|
||||
"git checkout $branch" can lose the current stat you arrived
|
||||
in these ways, and "git checkout" refuses when the detached
|
||||
HEAD is not pointed by any existing ref (an existing branch,
|
||||
a remote tracking branch or a tag). This safety can be
|
||||
overridden with "git checkout -f $branch".
|
||||
Remember that a detached state is volatile, i.e. it will be forgotten
|
||||
as soon as you move away from it with the checkout or reset command,
|
||||
unless a branch is created from it as mentioned above. It is also
|
||||
possible to rescue a lost detached state from the HEAD reflog.
|
||||
|
||||
|
||||
* Packed refs
|
||||
|
@ -411,14 +409,14 @@ Updates in v1.5.0 since v1.4.4 series
|
|||
|
||||
* Foreign SCM interfaces
|
||||
|
||||
- git-svn now requires the Perl SVN:: libraries, the
|
||||
command-line backend was too slow and limited.
|
||||
- git-svn now requires the Perl SVN:: libraries, the
|
||||
command-line backend was too slow and limited.
|
||||
|
||||
- the 'commit' subcommand of git-svn has been renamed to
|
||||
'set-tree', and 'dcommit' is the recommended replacement for
|
||||
day-to-day work.
|
||||
- the 'commit' subcommand of git-svn has been renamed to
|
||||
'set-tree', and 'dcommit' is the recommended replacement for
|
||||
day-to-day work.
|
||||
|
||||
- git fast-import backend.
|
||||
- git fast-import backend.
|
||||
|
||||
|
||||
* User support
|
||||
|
|
|
@ -145,6 +145,7 @@ sub format_one {
|
|||
git-relink ancillarymanipulators
|
||||
git-repack ancillarymanipulators
|
||||
git-config ancillarymanipulators
|
||||
git-remote ancillarymanipulators
|
||||
git-request-pull foreignscminterface
|
||||
git-rerere ancillaryinterrogators
|
||||
git-reset mainporcelain
|
||||
|
|
|
@ -3,7 +3,7 @@ git-fast-import(1)
|
|||
|
||||
NAME
|
||||
----
|
||||
git-fast-import - Backend for fast Git data importers.
|
||||
git-fast-import - Backend for fast Git data importers
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
|
5
Makefile
5
Makefile
|
@ -939,11 +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";; \
|
||||
|
|
Loading…
Reference in a new issue