All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jean-Christian de Rivaz <jc@eclis.ch>
To: git@vger.kernel.org
Subject: I used git pull instead of stg pull !
Date: Tue, 10 Jul 2007 11:52:47 +0200	[thread overview]
Message-ID: <469356EF.201@eclis.ch> (raw)

Hi,

I have made the error to use the "git pull" command instead of the "stg 
pull" command. The "git pull" have been executed successfuly, but now 
stg seem to be confused:

stg pull -n
stg pull: local changes in the tree. Use "refresh" to commit them

stg new dummy -m "dummy"
stg new: HEAD and top are not the same. You probably committed
   changes to the tree outside of StGIT. If you know what you
   are doing, use the "refresh -f" command

How can I restore the archive to a normal state for stg ?

Best regards,
--
Jean-Christian de Rivaz

             reply	other threads:[~2007-07-10 10:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-10  9:52 Jean-Christian de Rivaz [this message]
2007-07-10 13:29 ` I used git pull instead of stg pull ! Karl Hasselström
2007-07-10 14:20   ` Jean-Christian de Rivaz

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=469356EF.201@eclis.ch \
    --to=jc@eclis.ch \
    --cc=git@vger.kernel.org \
    /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.