Revision: 47ada6d55e5d
Author: nogu.dev <[email protected]>
Date: Fri May 4 01:39:36 2012
Log: Add notes on merge without rebasing in DevelopUim.wiki.
* DevelopUim.wiki
- (Using an external repository): Add notes on merge without rebasing.
http://code.google.com/p/uim/source/detail?r=47ada6d55e5d&repo=wiki
Modified:
/DevelopUim.wiki
=======================================
--- /DevelopUim.wiki Sun Apr 8 04:01:57 2012
+++ /DevelopUim.wiki Fri May 4 01:39:36 2012
@@ -133,6 +133,12 @@
$ git merge baz
$ git push origin master
}}}
+
+or just merge the changes into a branch in your local repository without
rebasing:
+{{{
+$ git checkout master
+$ git merge baz
+}}}
= Translation =
== Updating translation files ==
