devel@ntpsec.org said: > Er, whoops! I broke that as part of my fix for improperly generated files. > Should be fixed now.
Thanks. Is there a simple way to do a git pull when I have edits in progress? [murray@hgm raw]$ git pull error: cannot pull with rebase: You have unstaged changes. error: please commit or stash them. [murray@hgm raw]$ I can commit them, but I'd like to do more testing first. I expect all the files I've edited don't conflict with any recent changes. I could save them off to the side, checkout to make git happy, git pull, then restore the saved copies. There must be a better way. Correspondingly, if I commit some changes, then discover a better way, is there a simple way to undo a commit? I think revert applies another commit that undoes the edit, but that leaves cruft in the log. Is there an option/command for the special case where the commit I want to undo is the last one? -- These are my opinions. I hate spam. _______________________________________________ devel mailing list devel@ntpsec.org http://lists.ntpsec.org/mailman/listinfo/devel
