summaryrefslogtreecommitdiff
path: root/Documentation/git-send-pack.txt
diff options
context:
space:
mode:
authorSteffen Prohaska <prohaska@zib.de>2007-11-11 14:01:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-19 02:39:01 (GMT)
commitae36bdcf5147b1b54de852eda111ad76a3040726 (patch)
treec50286f86b92ead687ddab7d51460bd9cbc70825 /Documentation/git-send-pack.txt
parent79803322c1d8d2f74e1a53d44f363d878180e0f5 (diff)
downloadgit-ae36bdcf5147b1b54de852eda111ad76a3040726.zip
git-ae36bdcf5147b1b54de852eda111ad76a3040726.tar.gz
git-ae36bdcf5147b1b54de852eda111ad76a3040726.tar.bz2
push: use same rules as git-rev-parse to resolve refspecs
This commit changes the rules for resolving refspecs to match the rules for resolving refs in rev-parse. git-rev-parse uses clear rules to resolve a short ref to its full name, which are well documented. The rules for resolving refspecs documented in git-send-pack were less strict and harder to understand. This commit replaces them by the rules of git-rev-parse. The unified rules are easier to understand and better resolve ambiguous cases. You can now push from a repository containing several branches ending on the same short name. Note, this may break existing setups. For example, "master" will no longer resolve to "origin/master" even when there is no other "master" elsewhere. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-send-pack.txt')
-rw-r--r--Documentation/git-send-pack.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 2fa01d4..a2d9cb6 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -85,7 +85,9 @@ Each pattern pair consists of the source side (before the colon)
and the destination side (after the colon). The ref to be
pushed is determined by finding a match that matches the source
side, and where it is pushed is determined by using the
-destination side.
+destination side. The rules used to match a ref are the same
+rules used by gitlink:git-rev-parse[1] to resolve a symbolic ref
+name.
- It is an error if <src> does not match exactly one of the
local refs.