diff options
author | Junio C Hamano <junkio@cox.net> | 2007-02-26 00:32:19 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-02-26 00:32:19 -0800 |
commit | 8807d321af394ffb2180d085669337bcd5018c50 (patch) | |
tree | 2956464a49a82a210612a2ea030a6affc12a67aa /Documentation/git-remote.txt | |
parent | 5569dad48e22e7b373ce3ffcc32758163bbd7b42 (diff) | |
parent | 0d9b9ab1284ce125fd49cf7dbf4d28e0540cf035 (diff) | |
download | git-8807d321af394ffb2180d085669337bcd5018c50.tar.gz |
Merge branch 'maint'
* maint:
GIT 1.5.0.2
git-remote: support remotes with a dot in the name
Documentation: describe "-f/-t/-m" options to "git-remote add"
diff --cc: fix display of symlink conflicts during a merge.
Diffstat (limited to 'Documentation/git-remote.txt')
-rw-r--r-- | Documentation/git-remote.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 250761f97e..266faade31 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -32,6 +32,19 @@ subcommands are available to perform operations on the remotes. Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>. ++ +With `-f` option, `git fetch <name>` is run immediately after +the remote information is set up. ++ +With `-t <branch>` option, instead of the default glob +refspec for the remote to track all branches under +`$GIT_DIR/remotes/<name>/`, a refspec to track only `<branch>` +is created. You can give more than one `-t <branch>` to track +multiple branche without grabbing all branches. ++ +With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set +up to point at remote's `<master>` branch instead of whatever +branch the `HEAD` at the remote repository actually points at. 'show':: |