All of lore.kernel.org
 help / color / mirror / Atom feed
From: Georg Schardt <schardt@team-ctech.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/3] fix checkpatch errors
Date: Sun, 07 Sep 2008 13:48:07 +0200	[thread overview]
Message-ID: <48C3BF77.9060801@team-ctech.de> (raw)
In-Reply-To: <20080907111503.D9122248BB@gemini.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

  reply	other threads:[~2008-09-07 11:48 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-06 10:25 [U-Boot] First Patch Georg Schardt
2008-09-06 10:25 ` [U-Boot] [PATCH 1/3] Add support for the virtex4fx12 minimodul Georg Schardt
2008-09-06 10:25   ` [U-Boot] [PATCH 2/3] fix checkpatch errors Georg Schardt
2008-09-06 10:25     ` [U-Boot] [PATCH 3/3] fix some other patch errors Georg Schardt
2008-09-06 13:22     ` [U-Boot] [PATCH 2/3] fix checkpatch errors Wolfgang Denk
2008-09-06 14:02       ` Georg Schardt
2008-09-06 15:45         ` Wolfgang Denk
2008-09-07 10:56           ` Georg Schardt
2008-09-07 11:15             ` Wolfgang Denk
2008-09-07 11:48               ` Georg Schardt [this message]
2008-09-08 12:15     ` JerryVanBaren
2008-09-08 12:38       ` Wolfgang Denk
2008-09-08 13:01       ` Haavard Skinnemoen
2008-09-06 13:34   ` [U-Boot] [PATCH 1/3] Add support for the virtex4fx12 minimodul Wolfgang Denk
2008-09-07 21:50     ` Ricardo
  -- strict thread matches above, loose matches on Subject: below --
2008-09-09 15:02 [U-Boot] [PATCH 2/3] fix checkpatch errors Hugo Villeneuve

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=48C3BF77.9060801@team-ctech.de \
    --to=schardt@team-ctech.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.