Revision: eb817989cc87
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 23:40:04 2012
Log: * DevelopUim.wiki
- Update.
http://code.google.com/p/uim/source/detail?r=eb817989cc87&repo=wiki
Modified:
/DevelopUim.wiki
=======================================
--- /DevelopUim.wiki Fri Mar 9 18:51:07 2012
+++ /DevelopUim.wiki Sat Mar 10 23:40:04 2012
@@ -125,10 +125,11 @@
}}}
where _baz_ is a topic branch.
-Before pushing your changes into the uim repository, merge the changes
into a branch in your local repository and rebase the branch:
+Before pushing your changes into the uim repository, rebase the branch,
merge the changes into a branch in your local repository:
{{{
+$ git checkout master
+$ git rebase master baz
$ git checkout master
$ git merge baz
-$ git rebase master
$ git push origin master
}}}
