diff options
author | Jeff King <peff@peff.net> | 2008-02-19 19:25:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-20 07:46:10 +0300 |
commit | 68d06c5200775ffda91881254ca7a92f27db68ef (patch) | |
tree | aeeb9432f045c74649a55ecbdb596b722d7b9a35 /Documentation/git-push.txt | |
parent | 2b8130c338715936fcda82e734e76e86a33316aa (diff) |
Documentation/push: clarify matching refspec behavior
The previous text was correct, but it was easy to miss the
fact that we are talking about "matching" refs. That is, the
text can be parsed as "we push the union of the sets
of remote and local heads" and not "we push the intersection
of the sets of remote and local heads". (The former actually
doesn't make sense if you think about it, since we don't
even _have_ some of those heads). A careful reading would
reveal the correct meaning, but it makes sense to be as
explicit as possible in documentation.
We also explicitly use and introduce the term "matching";
this is a term discussed on the list, and it seems useful
to for users to be able to refer to this behavior by name.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r-- | Documentation/git-push.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 5f2494495b..650ee91483 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -47,9 +47,9 @@ even if it does not result in a fast forward update. + Note: If no explicit refspec is found, (that is neither on the command line nor in any Push line of the -corresponding remotes file---see below), then all the -heads that exist both on the local side and on the remote -side are updated. +corresponding remotes file---see below), then "matching" heads are +pushed: for every head that exists on the local side, the remote side is +updated if a head of the same name already exists on the remote side. + `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. + |