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 messageAANLkTilaJ7MVv7VxxreBkCCSzYSZVSqULk_3I5AHlS4s@mail.gmail.com 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