Merge branch 'maint-1.6.3' into maint

* maint-1.6.3:
  Fix typos in git-remote.txt and git-symbolic-ref.txt
This commit is contained in:
Junio C Hamano 2009-08-10 22:23:48 -07:00
Родитель f0e588dffc 75f492ace7
Коммит e532e7b08f
2 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -114,14 +114,14 @@ These stale branches have already been removed from the remote repository
referenced by <name>, but are still locally available in referenced by <name>, but are still locally available in
"remotes/<name>". "remotes/<name>".
+ +
With `--dry-run` option, report what branches will be pruned, but do no With `--dry-run` option, report what branches will be pruned, but do not
actually prune them. actually prune them.
'update':: 'update'::
Fetch updates for a named set of remotes in the repository as defined by Fetch updates for a named set of remotes in the repository as defined by
remotes.<group>. If a named group is not specified on the command line, remotes.<group>. If a named group is not specified on the command line,
the configuration parameter remotes.default will get used; if the configuration parameter remotes.default will be used; if
remotes.default is not defined, all remotes which do not have the remotes.default is not defined, all remotes which do not have the
configuration parameter remote.<name>.skipDefaultUpdate set to true will configuration parameter remote.<name>.skipDefaultUpdate set to true will
be updated. (See linkgit:git-config[1]). be updated. (See linkgit:git-config[1]).

Просмотреть файл

@ -14,9 +14,9 @@ DESCRIPTION
Given one argument, reads which branch head the given symbolic Given one argument, reads which branch head the given symbolic
ref refers to and outputs its path, relative to the `.git/` ref refers to and outputs its path, relative to the `.git/`
directory. Typically you would give `HEAD` as the <name> directory. Typically you would give `HEAD` as the <name>
argument to see on which branch your working tree is on. argument to see which branch your working tree is on.
Give two arguments, create or update a symbolic ref <name> to Given two arguments, creates or updates a symbolic ref <name> to
point at the given branch <ref>. point at the given branch <ref>.
A symbolic ref is a regular file that stores a string that A symbolic ref is a regular file that stores a string that