From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiangfu Liu Date: Tue, 20 Jul 2010 23:29:23 +0800 Subject: [U-Boot] Question about patches In-Reply-To: <20100720125938.E1FC3153780@gemini.denx.de> References: <201007200855.01581.fabio.giovagnini@aurion-tech.com> <4C454997.3030400@st.com> <201007200939.36563.fabio.giovagnini@aurion-tech.com> <4C456703.10502@st.com> <20100720095256.D65DF14EB08@gemini.denx.de> <20100720125938.E1FC3153780@gemini.denx.de> Message-ID: <4C45C0D3.30205@openmobilefree.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi (share my info :) I am always use stg like this: for example there are three commit: commit1, commit2, commit3, then I edit file: a.c, b.c, c.c and I want a.c goto commit1. b.c goto commit2. c.c goto commit3. then stg refresh a.c -p commit1 stg refresh b.c -p commit2 stg refresh c.c -p commit3 I know this is not good. because this may lose change history. but I use this for create patches for OpenWrt system. On 07/20/2010 08:59 PM, Wolfgang Denk wrote: > Dear Graeme Russ, > > In message you wrote: >> >> Now you will have a bunch of commits, but maybe they are in the wrong order > ... >> you can then use stg pop/push/merge to re-arrange and merge commits >> together to get them in a more logical arrangement before submitting > > With "git rebase -i" I get an editor started like this: > > pick 3e9b349 NAND: show manufacturer and device ID for unknown chips > pick 1445f6f NAND: add Toshiba TC58NVG0 identifier > pick bc1a884 mtd: nand_plat: add simple GPIO framework DEV_READY option > pick 67ceefa Blackfin: convert plat-nand code to GPIO framework > pick c9f7351 NAND: environment offset in OOB (CONFIG_ENV_OFFSET_OOB) > pick 53504a2 NAND: formatting cleanups from env.oob support > ... > # Commands: > # p, pick = use commit > # r, reword = use commit, but edit the commit message > # e, edit = use commit, but stop for amending > # s, squash = use commit, but meld into previous commit > # f, fixup = like "squash", but discard this commit's log message -- Best Regards Xiangfu Liu http://www.openmobilefree.net