From: Alan Chandler <alan@chandlerfamily.org.uk>
To: git@vger.kernel.org
Cc: Linus Torvalds <torvalds@osdl.org>
Subject: Re: Some advanced index playing
Date: Sun, 3 Dec 2006 20:40:12 +0000 [thread overview]
Message-ID: <200612032040.13100.alan@chandlerfamily.org.uk> (raw)
In-Reply-To: <Pine.LNX.4.64.0612031024480.3476@woody.osdl.org>
On Sunday 03 December 2006 18:34, Linus Torvalds wrote:
...
> So in short, you should just have done "git reset", and you'd have
> reset your index back to the state of your last commit.
>
> So "git reset" is generally your friend whenever something goes
> wrong. If you also want to reset your checked-out files (which you
> did NOT want to do in this case, of course), you would have added the
> "--hard" flag to git reset.
Doh [slaps head with wet blanket]
I was so worried about NOT changing my working tree - I totally
overlooked the reset command. I had never quite understood
what --mixed really meant before. But re-reading the man page now, its
obvious.
--
Alan Chandler
prev parent reply other threads:[~2006-12-03 20:40 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-03 17:01 Some advanced index playing Alan Chandler
2006-12-03 18:24 ` Linus Torvalds
2006-12-03 19:36 ` Junio C Hamano
2006-12-03 20:11 ` Alan Chandler
2006-12-03 20:19 ` Jakub Narebski
2006-12-03 20:29 ` Alan Chandler
2006-12-03 20:40 ` Linus Torvalds
2006-12-04 10:41 ` Junio C Hamano
2006-12-03 18:31 ` Jakub Narebski
2006-12-03 18:34 ` Linus Torvalds
2006-12-03 20:26 ` Junio C Hamano
2006-12-05 3:48 ` [PATCH] git-explain Junio C Hamano
2006-12-05 3:55 ` Nicolas Pitre
2006-12-05 3:57 ` J. Bruce Fields
2006-12-05 6:09 ` Junio C Hamano
2006-12-05 7:26 ` Jeff King
2006-12-05 9:21 ` Eric Wong
2006-12-08 10:49 ` [RFC/PATCH 0/5] WIP status/rerere reporting Eric Wong
2006-12-08 10:49 ` [PATCH 1/5] rerere: avoid misrecording on a skipped or aborted rebase/am Eric Wong
2006-12-08 19:33 ` Junio C Hamano
2006-12-08 20:04 ` [PATCH 6/5] git-rerere: document the 'clear' and 'diff' commands Eric Wong
2006-12-08 20:43 ` [PATCH 1/5] rerere: avoid misrecording on a skipped or aborted rebase/am Junio C Hamano
2006-12-08 21:28 ` Eric Wong
2006-12-08 21:29 ` [PATCH] rerere: add clear, diff, and status commands Eric Wong
2006-12-08 21:29 ` [PATCH] rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am Eric Wong
2006-12-08 21:44 ` Jakub Narebski
2006-12-08 21:50 ` Eric Wong
2006-12-09 20:08 ` Junio C Hamano
2006-12-08 10:49 ` [PATCH 2/5] status: show files that would have resolutions recorded by rerere Eric Wong
2006-12-08 10:49 ` [PATCH 3/5] am and rebase resolve states get picked up by status/commit Eric Wong
2006-12-08 10:49 ` [PATCH 4/5] am: run git rerere to record resolution on successful --resolved Eric Wong
2006-12-08 10:49 ` [PATCH 5/5] rerere: add the diff command Eric Wong
2006-12-08 12:07 ` Jakub Narebski
2006-12-05 17:34 ` [PATCH] git-explain Horst H. von Brand
2006-12-05 8:58 ` Johannes Schindelin
2006-12-05 21:00 ` J. Bruce Fields
2006-12-05 9:11 ` Raimund Bauer
2006-12-05 10:43 ` Jakub Narebski
2006-12-05 23:00 ` Martin Langhoff
2006-12-05 23:07 ` Junio C Hamano
2006-12-05 23:37 ` Johannes Schindelin
2006-12-05 23:57 ` Junio C Hamano
2006-12-06 0:07 ` Carl Worth
2006-12-06 0:27 ` Johannes Schindelin
2006-12-06 1:50 ` Nicolas Pitre
2006-12-03 20:40 ` Alan Chandler [this message]
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=200612032040.13100.alan@chandlerfamily.org.uk \
--to=alan@chandlerfamily.org.uk \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).