[U-Boot] [PATCH 2/3] fix checkpatch errors
Georg Schardt
schardt at team-ctech.de
Sun Sep 7 13:48:07 CEST 2008
Hi again,
> This all looks good so far
>
>
>> - then i try "git rebase master" and get the message "Current branch
>> master is up to date"
>>
>
> Hm... the "current branch master" makes be believe that you might have
> checked out the master branch now? You should still have the "testing"
> branch checked out.
>
you are right, sorry. but with testing checkout there is no different
schardt at schleppi:~/embedded/u-boot$ git branch
i.MX31
lwmon5
master
origin
* testing
wd at denx.de
schardt at schleppi:~/embedded/u-boot$ git-rebase master
Current branch testing is up to date.
> Also note, that when you want to combine the two commits into one for
> submission, you have to use "git-rebase -i master" to run in
> interactive mode.
>
>
Huuh, i have no option -i available. i use git 1.4.4.4. *argl*
regards
georg
More information about the U-Boot
mailing list