git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: lamikr <lamikr@cc.jyu.fi>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: undoing changes with git-checkout -f
Date: Tue, 10 Jan 2006 00:52:39 +0200	[thread overview]
Message-ID: <43C2E937.4060508@cc.jyu.fi> (raw)
In-Reply-To: <7vmzi5hy69.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:

>lamikr <lamikr@cc.jyu.fi> writes:
>
>  
>
>>1) I clone git repo by using command
>>
>>    git-clone rsync://source.mvista.com/git/linux-omap-2.6.git
>>linux-omap-2.6
>>    
>>
>
>Please do not use rsync:// transport if possible (mvista might
>only pubilsh via rsync:// and not git://, so it may not be your fault).
>  
>
Ok, I will send a message to maintainer. I was just pasting the address
from their instructions. (They were using cogito on top of git, but I
want to learn to use pure git commands first)

>Nothing.  After the second step, git does not know anything
>about 1.txt; if it is a part of something you wanted to
>eventually commit, or it is some notes you took while perusing
>the source and is precious even when you switch branches (even
>though you would not commit it as part of the project) , so it
>does not touch it.  After running "make", "checkout -f" does not
>do "make clean" for you to remove *.o files either, for exactly
>the same reason.
>
>"git status" would tell you the file is "untracked".
>
>If you did something like this:
>
>	$ edit 1.txt
>        $ git add 1.txt
>        $ git reset --hard
>
>"git reset --hard" would remove it, while "git checkout -f"
>would leave the file behind.
>  
>
Ok, so this describes the power difference between "checkout -f"
and "git-reset --hard" pretty well.

>BTW, please do not set Reply-To: (or Mail-Followup-To: for that
>matter) to the list.  When I (or somebody else) want to reply
>to you, especially in private, your Reply-To: header forces me
>to manually rewrite the To: header MUA prepares for me.
>
>I know why you do it --- you are on the list and otherwise you
>would get duplicate messages, one from me directly and another
>from the list.  I've seen other people do it, but IMNSHO it is a
>bad practice.  Filter them on your end, and do not put extra
>burden to others, please.  The only case mucking with the
>addressee headers may be acceptable is to remove yourself from
>CC: list when a list you are on is on the CC: list.
>  
>
Yes, I am a victim of graphical email reader aka "thunderbird".
But I will now remember to do this for vger mailing lists.

A little off topic, but I just wish that http mail archive apps like the
one used in
http://marc.theaimsgroup.com/?l=linux-kernel
could also offer possibility to filter duplicates away.

Mika

  reply	other threads:[~2006-01-09 22:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-09 21:16 undoing changes with git-checkout -f lamikr
2006-01-09 21:46 ` Junio C Hamano
2006-01-09 22:52   ` lamikr [this message]
2006-01-10  4:55   ` Joel Becker
2006-01-10  5:57     ` Junio C Hamano
2006-01-10  6:32       ` Joel Becker
2006-01-10  7:18         ` Joel Becker
2006-01-10  7:42         ` Junio C Hamano
2006-01-10  8:16           ` Joel Becker
2006-01-10 14:51     ` Johannes Schindelin
2006-01-10 16:17       ` Alex Riesen
2006-01-10 16:45         ` Johannes Schindelin
2006-01-10 17:32           ` Alex Riesen
     [not found] ` <Pine.LNX.4.64.0601091321390.5588@g5.osdl.org>
2006-01-09 22:36   ` lamikr

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=43C2E937.4060508@cc.jyu.fi \
    --to=lamikr@cc.jyu.fi \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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).