From: "Horst H. von Brand" <vonbrand@inf.utfsm.cl>
To: git@vger.kernel.org
Cc: Horst von Brand <vonbrand@inf.utfsm.cl>
Subject: git 1.8.0.rc0.18.gf84667d trouble with "git commit -p file"
Date: Fri, 05 Oct 2012 11:20:45 -0300 [thread overview]
Message-ID: <201210051420.q95EKjj3008300@netbook1.inf.utfsm.cl> (raw)
What I did:
- New file images/coins.asy ~~-> 'git add images/coins.asy'
- Started adding new stuff to fg.tex
- Noticed a old bug in fg.tex, fixed that one
- Did 'git -pm "Some message"' and selected just the bugfix
But git created a commit _including_ the new file. Tried to go back:
- 'git reset HEAD^'
Now the new file isn't staged anymore
What I expected to happen:
- Only the explicitly selected chunks commited
- No "losing staged changes"
--
Dr. Horst H. von Brand User #22616 counter.li.org
Departamento de Informatica Fono: +56 32 2654431
Universidad Tecnica Federico Santa Maria +56 32 2654239
Casilla 110-V, Valparaiso, Chile 2340000 Fax: +56 32 2797513
next reply other threads:[~2012-10-05 14:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 14:20 Horst H. von Brand [this message]
2012-10-05 19:55 ` git 1.8.0.rc0.18.gf84667d trouble with "git commit -p file" Frans Klaver
2012-10-05 22:29 ` Junio C Hamano
2012-10-05 22:57 ` Jeff King
2012-10-06 6:26 ` Junio C Hamano
2012-10-06 13:12 ` Jeff King
2012-10-06 18:22 ` Junio C Hamano
2012-10-06 18:30 ` Jeff King
2012-10-06 18:32 ` Conrad Irwin
2012-10-06 19:07 ` Jeff King
2012-10-07 20:51 ` Junio C Hamano
2012-10-07 21:49 ` Jeff King
2012-10-07 22:23 ` Junio C Hamano
2012-10-07 22:25 ` Jeff King
2012-10-11 5:51 ` Conrad Irwin
2012-10-11 17:57 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201210051420.q95EKjj3008300@netbook1.inf.utfsm.cl \
--to=vonbrand@inf.utfsm.cl \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).