From: Junio C Hamano <gitster@pobox.com>
To: Sven Strickroth <sven.strickroth@tu-clausthal.de>
Cc: git@vger.kernel.org
Subject: Re: howto handle name clashes
Date: Fri, 23 Mar 2012 11:25:55 -0700 [thread overview]
Message-ID: <7vlimrtbrg.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4F6C7539.3080607@tu-clausthal.de> (Sven Strickroth's message of "Fri, 23 Mar 2012 14:06:01 +0100")
Sven Strickroth <sven.strickroth@tu-clausthal.de> writes:
> how to handle name clashes for branches and tags? Is there anything I
> can add to the refspec to make the name unique?
>
> E.g.
> - for merging "git merge --no-ff refs/branches/test" works, but
> generates a not so nice default merge message. ("merged commit
> refs/branches/test" instead of "merged branch test")
That's the price you pay for naming different things the same and having
to disambiguate it.
> - how to drop a remote tag/branch ("git push origin :test" does not work)
"git push origin :refs/tags/test"
It is sad that some people teach new people shorthand without telling them
that what they are teaching are merely shorthand and cause confusion like
this.
prev parent reply other threads:[~2012-03-23 18:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 13:06 howto handle name clashes Sven Strickroth
2012-03-23 17:12 ` Jeff King
2012-03-23 17:43 ` Sven Strickroth
2012-03-23 18:29 ` Jeff King
2012-03-24 0:19 ` Sven Strickroth
2012-03-23 18:25 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vlimrtbrg.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sven.strickroth@tu-clausthal.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).