
7 Sep
2008
7 Sep
'08
1:48 p.m.
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@schleppi:~/embedded/u-boot$ git branch i.MX31 lwmon5 master origin * testing wd@denx.de
schardt@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