Revision: 4a6a2fd6e67b
Author: nogu.dev <[email protected]>
Date: Fri Mar 9 18:19:31 2012
Log: * DevelopUim.wiki
- Add sections to `Misc'.
http://code.google.com/p/uim/source/detail?r=4a6a2fd6e67b&repo=wiki
Modified:
/DevelopUim.wiki
=======================================
--- /DevelopUim.wiki Sun Mar 4 04:26:24 2012
+++ /DevelopUim.wiki Fri Mar 9 18:19:31 2012
@@ -77,7 +77,39 @@
}}}
= Misc =
-== Use external repository ==
+== Create a tracking branch ==
+If you want to create a branch which tracks a stable branch in the uim
repository, create a tracking branch:
+{{{
+$ git checkout --track -b x.y origin/x.y
+}}}
+where x.y is the name of a stable branch in the uim repository.
+
+If you made changes to the tracking branch and want to make your changes
to the uim repository, push your changes specifying the name of the branch:
+{{{
+$ git push origin x.y
+}}}
+
+== Apply a patch by a contributor ==
+If you are a committer and you want to apply a patch by a contributor to
the uim repository, you can use `git apply' or `git am'.
+
+If the patch was generated by `git diff' or `diff', use the former:
+{{{
+$ git apply patch-by-contributor.patch
+}}}
+
+If the patch was generated by `git format-patch', use the latter:
+{{{
+$ git am patch-by-contributor.patch
+}}}
+
+== Push a change which was pushed to another branch ==
+You can push a change to the master branch which was pushed to a stable
branch and vice versa:
+{{{
+$ git cherry-pick -e -x abcde
+}}}
+where `abcde' is the change which was pushed to one branch and will be
pushed to another branch.
+
+== Use an external repository ==
You can create an external repository outside Google Code. If you want to
create your external repository in GitHub, the operation will be as follows:
{{{
$ git remote add github [email protected]:foo/bar.git
