From mboxrd@z Thu Jan  1 00:00:00 1970
From: Georg Schardt <schardt@team-ctech.de>
Date: Sun, 07 Sep 2008 13:48:07 +0200
Subject: [U-Boot] [PATCH 2/3] fix checkpatch errors
In-Reply-To: <20080907111503.D9122248BB@gemini.denx.de>
References: <12206967514047-git-send-email-schardt@team-ctech.de>
	<12206967521515-git-send-email-schardt@team-ctech.de>
	<12206967521471-git-send-email-schardt@team-ctech.de>
	<20080906132229.ED67A24815@gemini.denx.de>
	<48C28D5E.5030802@team-ctech.de>
	<20080906154504.5D64324815@gemini.denx.de>
	<48C3B358.6010500@team-ctech.de>
	<20080907111503.D9122248BB@gemini.denx.de>
Message-ID: <48C3BF77.9060801@team-ctech.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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