From: Pierre Habouzit <madcoder@debian.org>
To: Keith Packard <keithp@keithp.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: rebase from ambiguous ref discards changes
Date: Fri, 07 Sep 2007 08:55:46 +0200 [thread overview]
Message-ID: <20070907065546.GA21418@artemis.corp> (raw)
In-Reply-To: <1189133898.30308.58.camel@koto.keithp.com>
[-- Attachment #1: Type: text/plain, Size: 1043 bytes --]
On Fri, Sep 07, 2007 at 02:58:18AM +0000, Keith Packard wrote:
> On Thu, 2007-09-06 at 16:26 -0700, Junio C Hamano wrote:
>
> > Perhaps you have ".git/master" by mistake?
>
> oops.
>
> $ find .git -name master
> ..git/master
> ..git/refs/heads/master
> ..git/refs/remotes/kyle/master
> ..git/refs/remotes/origin/master
> ..git/refs/remotes/otc/master
> ..git/logs/refs/heads/master
> ..git/logs/refs/remotes/fdo/master
> ..git/logs/refs/remotes/kyle/master
> ..git/logs/refs/remotes/origin/master
> ..git/logs/refs/remotes/otc/master
>
> So, I think that explains where the ambiguous master came from. Seems
> like rebase should be able to bail out before breaking things though.
Actually if I get this right, it didn't broke anything, it just
rebased your ".git/master" :) It just chose the wrong desambiguation for
some reason.
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-09-07 6:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-06 21:48 rebase from ambiguous ref discards changes Keith Packard
2007-09-06 22:37 ` Pierre Habouzit
2007-09-06 23:26 ` Junio C Hamano
2007-09-07 2:58 ` Keith Packard
2007-09-07 6:55 ` Pierre Habouzit [this message]
2007-09-07 11:21 ` [PATCH] HEAD, ORIG_HEAD and FETCH_HEAD are really special Junio C Hamano
2007-09-07 12:36 ` Johannes Sixt
2007-09-07 12:42 ` Pierre Habouzit
2007-09-07 20:39 ` Junio C Hamano
2007-09-07 21:04 ` Pierre Habouzit
2007-09-08 22:20 ` Alex Riesen
2007-09-07 16:03 ` Keith Packard
2007-09-07 16:08 ` Keith Packard
2007-09-07 16:29 ` Nicolas Pitre
2007-09-07 20:32 ` Junio C Hamano
2007-09-07 21:53 ` Carl Worth
2007-09-07 22:08 ` 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=20070907065546.GA21418@artemis.corp \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=keithp@keithp.com \
/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.