Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Junio C Hamano committed Feb 14, 2007
2 parents 859f9c4 + 4b02c52 commit ddfff26
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
26 changes: 12 additions & 14 deletions Documentation/RelNotes-1.5.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Documentation/cmd-list.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-fast-import.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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";; \
Expand Down

0 comments on commit ddfff26

Please sign in to comment.