diff --git a/docs/GettingStarted.html b/docs/GettingStarted.html index 39104dff146..0695d7d933a 100644 --- a/docs/GettingStarted.html +++ b/docs/GettingStarted.html @@ -827,6 +827,73 @@ on the master branch, run the following command: git config branch.master.rebase true +

Sending patches with Git

+
+

+Please read Developer Policy, too. +

+ +

+Assume master points the upstream and mybranch points your +working branch, and mybranch is rebased onto master. +At first you may check sanity of whitespaces: +

+ +
+git diff --check master..mybranch
+
+ +

+The easiest way to generate a patch is as below: +

+ +
+git diff master..mybranch > /path/to/mybranch.diff
+
+ +

+It is a little different from svn-generated diff. git-diff-generated diff has +prefixes like a/ and b/. Don't worry, most developers might +know it could be accepted with patch -p1 -N. +

+ +

+But you may generate patchset with git-format-patch. It generates +by-each-commit patchset. To generate patch files to attach to your article: +

+ +
+git format-patch --no-attach master..mybranch -o /path/to/your/patchset
+
+ +

+If you would like to send patches directly, you may use git-send-email or +git-imap-send. Here is an example to generate the patchset in Gmail's [Drafts]. +

+ +
+git format-patch --attach master..mybranch --stdout | git imap-send
+
+ +

+Then, your .git/config should have [imap] sections. +

+ +
+[imap]
+        host = imaps://imap.gmail.com
+        user = your.gmail.account@gmail.com
+        pass = himitsu!
+        port = 993
+        sslverify = false
+; in English
+        folder = "[Gmail]/Drafts"
+; example for Japanese, "Modified UTF-7" encoded.
+        folder = "[Gmail]/&Tgtm+DBN-"
+
+ +
+

For developers to work with git-svn