diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-11 09:23:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-11 09:23:59 +0400 |
| commit | efd17968387482f5765a969813707629b85bf74f (patch) | |
| tree | 00bbc3ee10846f5131f2a42244b8276ec366e9f4 /Documentation | |
| parent | 56b36b834db41ea81066000f02c13ea8d63cbfcb (diff) | |
| parent | e532e7b08f3de1a590db909c2c93532c2a39e9ae (diff) | |
Merge branch 'maint'
* maint:
Fix typos in git-remote.txt and git-symbolic-ref.txt
git-instaweb: fix mod_perl detection for apache2
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-remote.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-symbolic-ref.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 9e2b4eaa38..82a3d29673 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -114,14 +114,14 @@ These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in "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. 'update':: 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, -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 configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated. (See linkgit:git-config[1]). diff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt index 210fde03a1..6392538807 100644 --- a/Documentation/git-symbolic-ref.txt +++ b/Documentation/git-symbolic-ref.txt @@ -14,9 +14,9 @@ DESCRIPTION Given one argument, reads which branch head the given symbolic ref refers to and outputs its path, relative to the `.git/` 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>. A symbolic ref is a regular file that stores a string that |