Re: [Qemu-devel] updating git tree

[Andreas Färber]

Am 28.04.2009 um 21:25 schrieb François Revol:

> > > you can use:
> > >
> > > git diff > tmp.patch
> > > patch -R -p1 < tmp.patch
> > > git pull
> > > patch -p1 < tmp.patch
> >
> > Or to stick with a `git` workflow, you can do:
> >
> > git commit -a -m "Description of local change"
> > git pull
>
> So, was it too hard to tell it in the first place ? ;)
>
> Though it doesn't like me...
> I have a file to remove, one to add, and I don't want to commit all  
> the
> changes at once...
>
> I tried git commit -i (it wanted it) -m "Merge usb-wacom into usb-hid"
> hw/usb-hid.c Makefile hw/usb-wacom.c
>
> but it didn't like usb-wacom.c being already gone by git rm ...
> + this stupid thing commited the popenaudio.c I wanted to leave for
> another commit despite not using -a...
>
> Plus it used the local hostname to make my email in the commit, and I
> couldn't find git-config as I saw it somewhere to change it...
>
> This is beyond logic.
> I thought it was supposed to be simpler but I'll have to git clone
> again, apply each diff and commit them separately... :(

To commit individual files, use `git add file1.c`, then `git commit`  
without -a.
You can check `git status` for what'll get committed.

While individual commands are referred to as git-svn, for instance,  
you need to call them without dash since v1.6, e.g., `git svn`.
So `git config --global user.email address@hidden should do the trick  
iirc. But does it matter locally? ;)

No need to clone again. To remove the last commit, simply do `git  
reset --hard HEAD^` (one accent circonflexe per commit backwards from  
HEAD).

Andreas