forked from kivy/python-for-android
-
Notifications
You must be signed in to change notification settings - Fork 12
Expand file tree
/
Copy pathCHANGELOG
More file actions
29 lines (21 loc) · 781 Bytes
/
Copy pathCHANGELOG
File metadata and controls
29 lines (21 loc) · 781 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
2016-06-27: Sync with upstream, version num == 0.4
2016-06-27: Guide to sync with upstream:
# ONLY DO IT AT THE FIRST TIME
git remote add upstream https://github.com/kivy/python-for-android.git
# Fetch all the branches of that remote into remote-tracking branches,
# such as upstream/master:
# git fetch upstream
git fetch upstream/master
# Make sure that you're on your master branch:
git checkout master
# Rewrite your master branch so that any commits of yours that
# aren't already in upstream/master are replayed on top of that
# other branch:
# ONLY DO IT AT THE FIRST TIME
git rebase upstream/master
# Otherwise, merge with the upstream
git merge upstream/master
# ONLY DO IT AT THE FIRST TIME
git push -f origin master
# Otherwise, just push
git push origin master