From mboxrd@z Thu Jan 1 00:00:00 1970 From: Georg Schardt Date: Sat, 06 Sep 2008 16:02:06 +0200 Subject: [U-Boot] [PATCH 2/3] fix checkpatch errors In-Reply-To: <20080906132229.ED67A24815@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> Message-ID: <48C28D5E.5030802@team-ctech.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 i tried to rebase my local testing-branch with my local master-branch, but i always get the message that the branch is up to date. then i merge my master-branch with "git pull . testing" with the testing-branch, but "git format-patch origin" creates me a patch-file for every commit from the testing-branch. how can i create a single file patch with the differents between the head of my testing-branch and the head of the master-branch ? regards georg Wolfgang Denk schrieb: > Dear Georg Schardt, > > In message <12206967521471-git-send-email-schardt@team-ctech.de> you wrote: >> --- >> include/configs/FX12MM.h | 12 ++++++------ >> 1 files changed, 6 insertions(+), 6 deletions(-) > > This file does not even exist yet. > > Please fix the code in your local branch, rebase your patch, and > resubmit a cleaned up patch. > > But make sure it actually compiles. > > Best regards, > > Wolfgang Denk > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkjCjV4ACgkQUicxT/v10ZveRQCfSUUfqVC90k/C8OaW+NS3LAc+ OVYAnA62F9hbvPI8BrhBbsau2aCBV+gK =OVKI -----END PGP SIGNATURE-----