Randal L. Schwartz, Thu, Jun 14, 2007 00:01:22 +0200: > In which case, it's even simpler: > > git-add . # add *everything* that's not .gitignored > git-commit -a -m WIP # save for replay (H above) > git-fetch origin # get upstream (P Q R) > git-rebase origin # creates E' F' G' H' > git-reset --soft HEAD^ # back up to G' > git-reset # mark everything un-added as of G' > > Yeah, this is far easier. > It is also wrong. You either add a lot of junk (because it is not ignored yet - who'll setup .gitignores just to check something?!) and spend a millenium hashing it (ever tried to add 4.7 DVD?) or it does not add really important files which just happen to be in .gitignore. IOW, this recipe is dangerous. It'll only _mostly_ work. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
