git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: deanhiller <dhiller@ghx.com>
To: git@vger.kernel.org
Subject: Re: the standard hotfix from production scenario not working for me in git...
Date: Thu, 28 Jul 2011 12:25:45 -0700 (PDT)	[thread overview]
Message-ID: <1311881145388-6631009.post@n2.nabble.com> (raw)
In-Reply-To: <4E31B51D.2080208@diamand.org>

/Can you just do 'git checkout -b newHitfix145 master' ?/

Coooooool, one less step!!!!! I think I remember reading that at somepoint,
but forgot about it.

/0. Would it help to use 'git status' to make sure that you don't have 
untracked flies kicking around?/

Not really, I know that I have untracked files lying around(and frequently
do git status currently anyways)

/Personally I would try to avoid having untracked files around, but maybe 
that's just me.  I usually find I only have a few untracked files at any
given time 
(after all, how fast can most people create new code?) so just keeping 
them tracked isn't a problem. Then 'git commit -a' will do the right 
thing won't it?/

On a prototype project, the rate of file creation is pretty high so I
frequently have untracked files....and I 99% of the time never have an
untracked file that I won't be checking in eventually(excluding the
.gitignore files of course), so having to do a specific step with them is
quite annoying.

Also, having to rm each file is "very" annoying...anyway to just do a git
commit ALL(which includes untracked files(except for .gitignore specified
ones), deleted files, modified files...I think that is the whole list).  

If I could do a git commit ALL, and then when I get back to that branch,
maybe there is a way to do a git reset HEAD BUT restore the committed files
to the filesystem as untracked/unstaged, etc. etc????

Today, I just copied the whole repository since I was having so much trouble
so then it is easier to do what I want, but the fact that I have to do that
feels like I am back in svn again where I did that as well so I would just
switch between directories when working on a hotfix...feels like there
should be a way in git as I thought git was avoiding that situation.

thanks,
Dean

Luke
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



--
View this message in context: http://git.661346.n2.nabble.com/the-standard-hotfix-from-production-scenario-not-working-for-me-in-git-tp6630648p6631009.html
Sent from the git mailing list archive at Nabble.com.

  reply	other threads:[~2011-07-28 19:25 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-28 17:35 the standard hotfix from production scenario not working for me in git deanhiller
2011-07-28 19:14 ` Luke Diamand
2011-07-28 19:25   ` deanhiller [this message]
2011-07-28 19:31 ` Andreas Schwab
2011-07-28 20:20   ` deanhiller
2011-07-28 20:28     ` deanhiller

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=1311881145388-6631009.post@n2.nabble.com \
    --to=dhiller@ghx.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).