Messages in this thread | | | Date | Thu, 15 Jan 2009 12:53:31 -0800 | From | Mike Travis <> | Subject | Re: [PATCH] x86: arch_probe_nr_irqs |
| |
Ingo Molnar wrote: > * Mike Travis <travis@sgi.com> wrote: > >> Very cool, thanks!! >> >> The one thing I always get hung up on is what args to use with the git >> rebase -i command. Say I want to edit 4a046d1 (which I do ;-), I see it >> in my repo with git-log (3rd one down): > > You shouldnt edit 4a046d1 anymore as i already pulled it - you can queue > up a fix commit. (Or we can decide to drop the whole tree and re-pull > yours - but that is an emergency path not to be taken lightly.) >
... rebase description deleted (thanks!)
> > Ok?
Yes.
> > ( Or if you are sure you can fix the bug via a single pass, you can change > the 'pick' line to 'edit' and do the editing and 'git commit --amend' > right during the rebase. If it's still not perfect it needs another > rebase though and it's easy to mess up rebases. ) > > Ingo
This all started because you wanted a more descriptive changelog for Yinghai's probe_nr_irqs() patch. I was attempting to do this, and is why I sent the full text to you, in case I couldn't do it (as you explained above).
I'm guessing this subject is now closed?
Thanks, Mike
| |