Open main menu
Home
Random
Log in
Settings
About Sugar Labs
Disclaimers
Sugar Labs
Search
Changes
← Older edit
Newer edit →
Activity Team/Git FAQ
(view source)
Revision as of 19:28, 6 October 2010
511 bytes added
,
19:28, 6 October 2010
→How do I send a patch to the Sugar developers?
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? ===
Walter
Bureaucrats
,
Administrators
10,533
edits