From: Andreas Schwab <schwab@suse.de>
To: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: linuxppc-dev@ozlabs.org, Sylvain Munaut <tnt@246tNt.com>
Subject: Re: master branch reset
Date: Tue, 05 Dec 2006 13:34:57 +0100 [thread overview]
Message-ID: <jeejrefrm6.fsf@sykes.suse.de> (raw)
In-Reply-To: <Pine.LNX.4.62.0612051157200.21116@pademelon.sonytel.be> (Geert Uytterhoeven's message of "Tue, 5 Dec 2006 11:58:45 +0100 (CET)")
Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> writes:
> On Tue, 5 Dec 2006, Sylvain Munaut wrote:
>> try git pull -f -v
>
> Thanks, that worked!
>
> But as I already started recloning and the old tree had some conflicts after
> the pull -f, I just switched to the new clone.
You can always wipe the slate clean with git reset --hard, that will give
you a fresh start.
Andreas.
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2006-12-05 12:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-04 11:44 master branch reset Paul Mackerras
2006-12-05 7:41 ` Geert Uytterhoeven
2006-12-05 7:49 ` Grant Likely
2006-12-05 8:02 ` Geert Uytterhoeven
2006-12-05 8:15 ` Grant Likely
2006-12-05 9:23 ` Geert Uytterhoeven
2006-12-05 10:13 ` Sylvain Munaut
2006-12-05 10:58 ` Geert Uytterhoeven
2006-12-05 12:34 ` Andreas Schwab [this message]
2006-12-05 10:54 ` Andreas Schwab
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=jeejrefrm6.fsf@sykes.suse.de \
--to=schwab@suse.de \
--cc=Geert.Uytterhoeven@sonycom.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=tnt@246tNt.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.