Activity Team/Git FAQ: Difference between revisions
| Line 151: | Line 151: | ||
You need to do this for each of the repositories you are working on (e.g. sugar + sugar-toolkit). | You need to do this for each of the repositories you are working on (e.g. sugar + sugar-toolkit). | ||
=== How do I amend a commit message? === | |||
If you have "dirty" history (i.e. other patches that are not in mainline | |||
yet) please create a branch carrying only those two patches and push | |||
that branch: | |||
git checkout -b to-push origin/master | |||
git cherry-pick <commit ID of first patch> | |||
git commit --amend | |||
(fix summary) | |||
git cherry-pick <commit ID of second patch> | |||
git commit --amend | |||
(fix summary) | |||
git push origin to-push:master | |||
You can remove the branch afterwards: | |||
git checkout master | |||
git branch -d to-push | |||
=== As a maintainer, how do I merge a patch? === | === As a maintainer, how do I merge a patch? === | ||