From: "Holger Hellmuth (IKS)" <hellmuth@ira.uka.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Rast <trast@student.ethz.ch>,
Hilco Wijbenga <hilco.wijbenga@gmail.com>,
Git Users <git@vger.kernel.org>, Jeff King <peff@peff.net>
Subject: Re: Your branch and 'origin/master' have diverged
Date: Wed, 15 Aug 2012 20:38:37 +0200 [thread overview]
Message-ID: <502BECAD.90307@ira.uka.de> (raw)
In-Reply-To: <7vfw7o6p1g.fsf@alter.siamese.dyndns.org>
Am 15.08.2012 19:30, schrieb Junio C Hamano:
> The current rule is very
> simple and understandable. You either say from the command line
> exactly what should happen (refspec without colon is the same as the
> refspec with colon at the end, meaning "do not track"; if you want
> to track, you write what to update with the fetch), or we use the
> configured refspec (which again spells what should happen).
Couldn't a similar new rule just say that refspec <name> is a short for
<name>:<name> ?
The exception would be in the case of a URL as remote, but that would
not be surprising to anyone, as there is no obvious target for the update
next prev parent reply other threads:[~2012-08-15 18:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-13 19:58 Your branch and 'origin/master' have diverged Hilco Wijbenga
2012-08-14 8:27 ` Thomas Rast
2012-08-14 17:04 ` Hilco Wijbenga
2012-08-14 17:19 ` Junio C Hamano
2012-08-14 18:32 ` Hilco Wijbenga
2012-08-14 18:49 ` Junio C Hamano
2012-08-14 20:12 ` Thomas Rast
2012-08-14 20:49 ` Junio C Hamano
2012-08-15 6:59 ` Thomas Rast
2012-08-15 17:30 ` Junio C Hamano
2012-08-15 18:38 ` Holger Hellmuth (IKS) [this message]
2012-08-15 19:07 ` Junio C Hamano
2012-08-15 19:22 ` Junio C Hamano
2012-08-16 16:24 ` Jeff King
2012-08-16 17:57 ` Junio C Hamano
2012-08-16 16:21 ` Jeff King
2012-08-14 22:15 ` Hilco Wijbenga
2012-08-14 22:35 ` Junio C Hamano
2012-08-14 16:02 ` PJ Weisberg
2012-08-14 17:07 ` Hilco Wijbenga
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=502BECAD.90307@ira.uka.de \
--to=hellmuth@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hilco.wijbenga@gmail.com \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
/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.