git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: the standard hotfix from production scenario not working for me in git...

From
Ddeanhiller <dhiller@ghx.com>
Date
Jul 28, 2011, 19:25 UTC
Message-ID
<1311881145388-6631009.post@n2.nabble.com>
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.

Previous: Luke DiamandNext: Andreas Schwab
Message 3 of 6 in “the standard hotfix from production scenario not working for me in git...”
  1. deanhillerJul 28, 2011
  2. Luke DiamandJul 28, 2011
  3. deanhillerJul 28, 2011
  4. Andreas SchwabJul 28, 2011
  5. deanhillerJul 28, 2011
  6. deanhillerJul 28, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.