From: "Santi Béjar" <santi@agolina.net>
To: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
Cc: git@vger.kernel.org
Subject: Re: understanding index
Date: Sat, 31 Jan 2009 21:57:29 +0100 [thread overview]
Message-ID: <adf1fd3d0901311257j1501d222nc24514b013bd13f3@mail.gmail.com> (raw)
In-Reply-To: <20090131201920.GC29748@ultras>
2009/1/31 Nicolas Sebrecht <nicolas.s-dev@laposte.net>:
>
> On Sat, Jan 31, 2009 at 01:09:49PM +0100, Santi Béjar wrote:
>
>> You omitted the help message of git status, where it says how to unstage:
>> # Changes to be committed:
>> # (use "git reset HEAD <file>..." to unstage)
>>
>> So to not commit foo at all:
>>
>> git reset HEAD foo
>
> Thanks. I didn't omitted the help message of git status.
These help messages (helpful messages?) were not in old version, but
in current git you get this indications when you execute "git status",
and it was what you put as "[...]".
$ git status
# On branch next
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: Makefile
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: Makefile
#
> The "unstage"
> action is what I was looking for but I was wrongly presuming (and I've
> read git docs !) that 'HEAD' is a kind of shortcut to the last commit of
> the current branch (not to the last state of the working tree).
By default git reset only acts on the head of the branch and the index, so with:
git reset HEAD foo
what you are saying is, use the HEAD as the head of the branch (don't
change my branch), but put in the index the state of foo in HEAD, so
in brief reset the index state of foo.
>
> Working on branch master for example, we have in .git/HEAD :
> ref: refs/heads/master
> And in .git/refs/heads/master, the hash of the last commit of branch
> master.
Right.
HTH,
Santi
next prev parent reply other threads:[~2009-01-31 21:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-31 11:10 understanding index Nicolas Sebrecht
2009-01-31 12:09 ` Santi Béjar
2009-01-31 14:45 ` Alex Riesen
[not found] ` <20090131124022.GB29748@ultras>
2009-01-31 20:19 ` Nicolas Sebrecht
2009-01-31 20:57 ` Santi Béjar [this message]
[not found] ` <20090131210939.GD29748@ultras>
2009-01-31 22:07 ` Nicolas Sebrecht
2009-01-31 21:18 ` Björn Steinbrink
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=adf1fd3d0901311257j1501d222nc24514b013bd13f3@mail.gmail.com \
--to=santi@agolina.net \
--cc=git@vger.kernel.org \
--cc=nicolas.s-dev@laposte.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).