diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-11-30 18:18:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-30 18:18:11 -0800 |
commit | 270c35490a52a635dc0ed1b1911c6861c68a68ed (patch) | |
tree | 1d65d2c7c564e3f40a1307b0a89628952431614b /Documentation | |
parent | 16d258332e35dad58c0b22cd4d5c0e63ebb25328 (diff) | |
parent | 18afe101eb2c2f68ba58085515f592148128fba3 (diff) | |
download | git-270c35490a52a635dc0ed1b1911c6861c68a68ed.tar.gz git-270c35490a52a635dc0ed1b1911c6861c68a68ed.tar.xz |
Merge branch 'mk/maint-cg-push' into maint
* mk/maint-cg-push:
git push: Interpret $GIT_DIR/branches in a Cogito compatible way
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/urls-remotes.txt | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt index 504ae8a53..41ec7774f 100644 --- a/Documentation/urls-remotes.txt +++ b/Documentation/urls-remotes.txt @@ -68,13 +68,22 @@ This file should have the following format: ------------ `<url>` is required; `#<head>` is optional. -When you do not provide a refspec on the command line, -git will use the following refspec, where `<head>` defaults to `master`, -and `<repository>` is the name of this file -you provided in the command line. + +Depending on the operation, git will use one of the following +refspecs, if you don't provide one on the command line. +`<branch>` is the name of this file in `$GIT_DIR/branches` and +`<head>` defaults to `master`. + +git fetch uses: + +------------ + refs/heads/<head>:refs/heads/<branch> +------------ + +git push uses: ------------ - refs/heads/<head>:<repository> + HEAD:refs/heads/<head> ------------ |