diff options
author | Junio C Hamano <junkio@cox.net> | 2007-05-06 00:21:03 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-05-06 00:21:03 -0700 |
commit | 125a5f1c2a93f217e92dd88210c2cb503032c02f (patch) | |
tree | adfe643504e7bfa6b3bdaf47b9ff5df3d5ba7349 /Documentation/git-remote.txt | |
parent | cc0e6c5adc783bcb29954f3a0b7a6197bcc9b1b3 (diff) | |
parent | e102d4353d7cfd69a597cd976eabdcb74641be69 (diff) | |
download | git-125a5f1c2a93f217e92dd88210c2cb503032c02f.tar.gz |
Merge branch 'maint'
* maint:
Small correction in reading of commit headers
Documentation: fix typo in git-remote.txt
Add test for blame corner cases.
blame: -C -C -C
blame: Notice a wholesale incorporation of an existing file.
Fix --boundary output
diff format documentation: describe raw combined diff format
Mention version 1.5.1 in tutorial and user-manual
Add --no-rebase option to git-svn dcommit
Fix markup in git-svn man page
Diffstat (limited to 'Documentation/git-remote.txt')
-rw-r--r-- | Documentation/git-remote.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index a9fb6a9a5e..3dde7134a5 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -40,7 +40,7 @@ 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. +multiple branches 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 |