From: Sven Strickroth <sven.strickroth@tu-clausthal.de>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: Re: howto handle name clashes
Date: Fri, 23 Mar 2012 18:43:37 +0100 [thread overview]
Message-ID: <4F6CB649.8080006@tu-clausthal.de> (raw)
In-Reply-To: <20120323171219.GB12881@sigill.intra.peff.net>
Am 23.03.2012 18:12 schrieb Jeff King:
>> - 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")
>
> Did you mean "refs/heads/test"?
yes. Your example was the correct one. Thanks for spotting my problem.
>> - how to drop a remote tag/branch ("git push origin :test" does not work)
>
> Does "git push origin :heads/foo" (or :tags/foo) not work?
seems to work. Thanks.
Really problematic is checkout:
"git checkout heads/foo" creates a detached HEAD (is this intended).
However, "git checkout heads/foo -B foo" can be used.
Is there a git command to find out if a name is ambiguous?
"git rev-parse foo" outputs "warning: refname 'test' is ambiguous.", but
the return code is zero.
--
Best regards,
Sven Strickroth
ClamAV, a GPL anti-virus toolkit http://www.clamav.net
PGP key id F5A9D4C4 @ any key-server
next prev parent reply other threads:[~2012-03-23 17:43 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 [this message]
2012-03-23 18:29 ` Jeff King
2012-03-24 0:19 ` Sven Strickroth
2012-03-23 18:25 ` Junio C Hamano
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=4F6CB649.8080006@tu-clausthal.de \
--to=sven.strickroth@tu-clausthal.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.