10,509
edits
Changes
Activity Team/Git FAQ (view source)
Revision as of 10:04, 17 September 2010
, 10:04, 17 September 2010→Patches
==Patches==
==Patches==
=== As a maintainer, how do I merge a patch? ===
=== How do I generate a patch? ===
:git-pull does a combination of fetch and merge, so to merge a patch...
git diff > blah.patch
:or
diff -rup [old] [new]
:or
git format-patch HEAD^
It is preferable that you generate your patch from the root directory of your project.
=== How do I send a patch to a maintainer? ===
=== How do I send a patch to a maintainer? ===
git send-email --to <maintainer> --cc <mailing-list> <filename>
git send-email --to <maintainer> --cc <mailing-list> <filename>
You may need to install git-mail:
sudo yum -y install git-email
You can also generate a merge request on Gitorious from your forked repository to mainline.
===How do I send a patch to the developers?===
=== How do I send a patch to the Sugar developers? ===
git send-email --to=sugar-devel@lists.sugarlabs.org 0001*.patch
git send-email --to=sugar-devel@lists.sugarlabs.org 0001*.patch
=== As a maintainer, how do I merge a patch? ===
:git-pull does a combination of fetch and merge, so to merge a patch...
git pull git://git.sugarlabs.org/myproject/myproject-clone.git master
==Internationalization work flow==
==Internationalization work flow==