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

[deanhiller <dhiller@ghx.com>]

I am doing the typical scenario and have tried much of the documentation but
must be getting something wrong.  I want to do something exactly like
this...

context: I am on branchBigFeature and a production hot fix comes in.  I
would like to
1. git stash --ALL_including_untracked_Files
2. git checkout master
3. git checkout -b newHotfix145
4. work on hotfix, fix it
5. git addANDrm * (is there a way to do this??????)  I don't want to have to
git rm each file to remove!!! or can I do git rm * ....does that work or
will that delete everything....ugh.  Better yet, is there a way to git
commit --skipStaging --includeUntrackedFiles --autoDeleteTheDeletions,
ie...basically any change in the view I want applied(unless files are in
.gitignore of course)
5. git checkout master
6. git merge newHotfix145
7. git push
8. git checkout branchBigFeature
9. git stash pop
and I am back to seeing all my untracked files.

I tried to do this with commit INSTEAD of stash like so but it failed
miserably.  I basically tried commit instead of stash and then to get the
files back to untracked, unversioned on the branchBigFeature, I used git
revert HEAD and this reverted everything but then it was all in the staging
area...maybe there is one more command I need to get it from the staging
area.

and one last question, I 90% of the time want to apply all unstaged files
deletes, adds, modifies...is there just one command I can use like git
commit * --skipstaging or something.  I have been burned too many times by
the build works with ALL the changes and then missing a checkin so I prefer
to check it all in every time and stay in that habit.

thanks,
Dean



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