On Wed, Aug 15, 2012 at 08:59:02AM +0200, Thomas Rast wrote:
I have never had a need for a fetch that doesn't update the remote
namespace, nor heard anyone on IRC who has. OTOH, I do have anecdotal
evidence in support of the current state is confusing: this thread, or
the fact that Jan's IRC
On Wed, Aug 15, 2012 at 12:22:28PM -0700, Junio C Hamano wrote:
The updated rule would be more complex. If a remote nickname is
used, and a refspec given from the command line is without colon, a
new special rule overrides the current behaviour and tries to match
with a configured
Jeff King p...@peff.net writes:
On Wed, Aug 15, 2012 at 12:22:28PM -0700, Junio C Hamano wrote:
The updated rule would be more complex. If a remote nickname is
used, and a refspec given from the command line is without colon, a
new special rule overrides the current behaviour and tries
Junio C Hamano gits...@pobox.com writes:
Thomas Rast tr...@student.ethz.ch writes:
In some sense this is a really bad case of wrong UI design, because we
(this happens on #git a lot) have to teach users not to use the command
so they won't trip over this problem. It would be better to fix
Thomas Rast tr...@student.ethz.ch writes:
Junio C Hamano gits...@pobox.com writes:
Thomas Rast tr...@student.ethz.ch writes:
In some sense this is a really bad case of wrong UI design, because we
(this happens on #git a lot) have to teach users not to use the command
so they won't trip
Holger Hellmuth (IKS) hellm...@ira.uka.de writes:
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
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 250 and 19 different commit(s) each, respectively.
#
nothing to commit (working directory clean)
He asked me what to do and I told him to do what has always worked
On Mon, Aug 13, 2012 at 12:58 PM, Hilco Wijbenga
hilco.wijbe...@gmail.com wrote:
Hi all,
A colleague of mine (after a relatively long absence) noticed the
following when running git status:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 250 and 19 different
On 14 August 2012 01:27, Thomas Rast tr...@student.ethz.ch wrote:
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 250 and 19 different commit(s) each, respectively.
#
nothing to commit (working directory clean
branch and 'origin/master' have diverged,
# and have 250 and 19 different commit(s) each, respectively.
#
nothing to commit (working directory clean)
He asked me what to do and I told him to do what has always worked for
me in the past when something like this happened: gitk, reset master
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
On 14 August 2012 01:27, Thomas Rast tr...@student.ethz.ch wrote:
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 250 and 19 different commit(s) each, respectively
On 14 August 2012 10:19, Junio C Hamano gits...@pobox.com wrote:
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
On 14 August 2012 01:27, Thomas Rast tr...@student.ethz.ch wrote:
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
# On branch master
# Your branch and 'origin/master' have
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
I suppose I'm not entirely clear on how this two step process is
safer. Doing git fetch would seem to be harmless, right? So the
problem is with git merge but master should always be behind
origin/master so that git merge should just FF to
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
On 14 August 2012 10:19, Junio C Hamano gits...@pobox.com wrote:
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
On 14 August 2012 01:27, Thomas Rast tr...@student.ethz.ch wrote:
[git pull with two args] it's ok if you use it with an URL
Thomas Rast tr...@student.ethz.ch writes:
In some sense this is a really bad case of wrong UI design, because we
(this happens on #git a lot) have to teach users not to use the command
so they won't trip over this problem. It would be better to fix the
real issue instead. IIRC it was even
On 14 August 2012 13:12, Thomas Rast tr...@student.ethz.ch wrote:
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
On 14 August 2012 10:19, Junio C Hamano gits...@pobox.com wrote:
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
On 14 August 2012 01:27, Thomas Rast tr...@student.ethz.ch wrote:
Hilco Wijbenga hilco.wijbe...@gmail.com writes:
I meant something else than Junio hinted at. Saying
git fetch origin master
# or by extension
git pull origin master
does not update the origin/* namespace, not even origin/master. All
fetching happens only into FETCH_HEAD. This
Hi all,
A colleague of mine (after a relatively long absence) noticed the
following when running git status:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 250 and 19 different commit(s) each, respectively.
#
nothing to commit (working directory clean)
He asked
18 matches
Mail list logo
