Activity Team/Git FAQ: Difference between revisions

← Older edit Newer edit →

@@ Line 90: / Line 90: @@
 ==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^
- git pull git://git.sugarlabs.org/myproject/myproject-clone.git master
+It is preferable that you generate your patch from the root directory of your project.
 === How do I send a patch to a maintainer? ===
@@ Line 103: / Line 107: @@
   git send-email --to <maintainer> --cc <mailing-list> <filename>
-=== How do I generate a patch? ===
+You may need to install git-mail:
- git diff > blah.patch
-:or
+  sudo yum -y install git-email
-  diff -rup [old] [new]
-:or
- git format-patch HEAD^
-It is preferable that you generate your patch from the root directory of your project.
+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
-You may need to install git-mail:
+=== As a maintainer, how do I merge a patch? ===
+:git-pull does a combination of fetch and merge, so to merge a patch...
-  sudo yum -y install git-email
+  git pull git://git.sugarlabs.org/myproject/myproject-clone.git master
 ==Internationalization work flow==