X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fpull-fetch-param.txt;h=ebdd948cd23931e9bbc35bb304868ce46902e464;hb=5fdb70983585ccde1540563a8c7458621f7a7407;hp=cbee369947bf43c245994607ba5d3f77246cce6d;hpb=7ac749c96d143ba4f76723959892cbaddbe8ed07;p=git.git diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index cbee36994..ebdd948cd 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -6,7 +6,7 @@ :: The canonical format of a parameter is - `+?:`; that is, an optional plus `+`, followed + `+?:`; that is, an optional plus `{plus}`, followed by the source ref, followed by a colon `:`, followed by the destination ref. + @@ -32,7 +32,7 @@ must know this is the expected usage pattern for a branch. [NOTE] You never do your own development on branches that appear on the right hand side of a colon on `Pull:` lines; -they are to be updated by `git-fetch`. If you intend to do +they are to be updated by 'git-fetch'. If you intend to do development derived from a remote branch `B`, have a `Pull:` line to track it (i.e. `Pull: B:remote-B`), and have a separate branch `my-B` to do your development on top of it. The latter @@ -44,13 +44,13 @@ on the remote branch, merge it into your development branch with + [NOTE] There is a difference between listing multiple -directly on `git-pull` command line and having multiple +directly on 'git-pull' command line and having multiple `Pull:` lines for a and running -`git-pull` command without any explicit parameters. +'git-pull' command without any explicit parameters. listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote refs, you would be making -an Octopus. While `git-pull` run without any explicit +an Octopus. While 'git-pull' run without any explicit parameter takes default s from `Pull:` lines, it merges only the first found into the current branch, after fetching all the remote refs. This is because making an