From: funeeldy <Marlene_Cote@affirmednetworks.com>
To: git@vger.kernel.org
Subject: Re: git checkout no longer warning about uncommitted/untracked files!
Date: Mon, 23 May 2011 14:05:04 -0700 (PDT) [thread overview]
Message-ID: <1306184704408-6396225.post@n2.nabble.com> (raw)
In-Reply-To: <1306171797211-6395441.post@n2.nabble.com>
This is with version 1.7.5.2 - it just keeps the files as modified when I
checkout a different branch. The bad thing about this is that if I make a
change on both branches, only the last change is kept, silently.
Earlier today when I tried this new version, the first checkout failed with
the error message I expected, but I cannot get it to show me that again.
private/marlene_cote/test/anroot/projects/kernel main_int $ git st
# On branch main_int
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working
directory)
#
# modified: Makefile
#
no changes added to commit (use "git add" and/or "git commit -a")
/private/marlene_cote/test/anroot/projects/kernel main_int $ git checkout
main
M Makefile
Branch main set up to track remote branch main from origin.
Switched to a new branch 'main'
/private/marlene_cote/test/anroot/projects/kernel main $ git checkout
main_int
M Makefile
Switched to branch 'main_int'
/private/marlene_cote/test/anroot/projects/kernel main_int $ git checkout
main
M Makefile
Switched to branch 'main'
v/private/marlene_cote/test/anroot/projects/kernel main $ vi Makefile
/private/marlene_cote/test/anroot/projects/kernel main $ git checkout
main_int
M Makefile
Switched to branch 'main_int'
--
View this message in context: http://git.661346.n2.nabble.com/git-checkout-no-longer-warning-about-uncommitted-untracked-files-tp6395441p6396225.html
Sent from the git mailing list archive at Nabble.com.
next prev parent reply other threads:[~2011-05-23 21:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-23 17:29 git checkout no longer warning about uncommitted/untracked files! funeeldy
2011-05-23 20:37 ` René Scharfe
2011-05-23 21:10 ` Jeff King
2011-05-23 21:05 ` funeeldy [this message]
2011-05-23 21:17 ` funeeldy
2011-05-23 21:18 ` Jeff King
2011-05-23 21:27 ` Marlene Cote
2011-05-23 21:18 ` Jeff King
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=1306184704408-6396225.post@n2.nabble.com \
--to=marlene_cote@affirmednetworks.com \
--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.
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).