Changes between Version 3 and Version 4 of github

Timestamp:

11/13/12 15:52:04 (11 years ago)

Author:

admin

Comment:

--

github

@@ -30 +30 @@
 }}}
 Now you can work on your local branch jb and push to the remote origin/jellybean
+
+== Update from original repo ==
+Create a remote for the upstream:
+{{{
+git remote add upstream git://github.com/Andromadus/android_frameworks_base.git
+}}}
+Fetch the remote
+{{{
+git fetch upstream
+}}}
+Merge the changes
+{{{
+git merge upstream/jellybean
+}}}