[Sugar-devel] Adjusting/reworking patches with git (was: Re: Patch: use standard cursors in Paint)

[Sascha Silbe]

Excerpts from James Cameron's message of Mon May 31 10:59:18 +0000 2010:

> 1.  "git checkout HASH" where hash is the patch to be fixed,
> 
> 2.  "git reset HEAD^" to undo this last commit without changing the
> working copy, then
> 
> 3.  "git add" and "git commit" again.

Even easier to use is "git rebase -i origin/master" (where origin/master
is the upstream branch). It supports editing entire patch sets as well,
including splitting up a patch into several smaller ones (with some
manual work, obviously). For every patch you get to choose what you want
to do:

pick a388ecf fix broken log statement in OlpcMeshManager._activate_connection() (#1890)
pick ff5cb3b set description
pick 78ff622 keyboard cpsection: don't choke on option group (SL#2022)

# Rebase cce927e..78ff622 onto cce927e
#
# 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
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#

The most recent patch (i.e. HEAD) is listed last.

Sascha
-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
Url : http://lists.sugarlabs.org/archive/sugar-devel/attachments/20100531/9289006e/attachment-0001.pgp