[U-Boot] [PATCH 2/3] fix checkpatch errors

Wolfgang Denk wd at denx.de
Sun Sep 7 13:15:03 CEST 2008


Dear Georg Schardt,

In message <48C3B358.6010500 at team-ctech.de> you wrote:
> 
> - create my own testing branch: "git branch testing"
> - switch to this branch: "git checkout testing"
> - copy/modify files
> - add the new files with "git add board/xilinx/fx12mm/"
> - commit the changes with "git commit -a"
> - create a patch with "git format-patch origin"
> - check this patch with checkpatch.pl
> - fix the errors, commit again, create patch again get 2 patchfiles

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.

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.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Have you lived in this village all your life?"        "No, not yet."


More information about the U-Boot mailing list