-
Notifications
You must be signed in to change notification settings - Fork 3
/
push-pull.txt
37 lines (27 loc) · 1.01 KB
/
push-pull.txt
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
30
31
32
33
34
35
36
37
For descriptions sake:
marvel is the name of the production host, but also the name of the branch!
dev is the name of the development/staging host
The setup is this:
<github> <--master--> <dev> ---master--><marvel>
<--marvel--
=============================================
# Setup production system:
# create repository, branch repository
git init
# You might need to check something in to make the branch work
git branch marvel
git checkout marvel
=============================================
# set up dev system:
git remote add marvel marvel:src/oeps
=============================================
# Push to production system
git push marvel
# will push master to master@marvel, while branch marvel is checked out
# on marvel:
git diff master # shows diff with current and master
git merge master # merges changes
=============================================
# Pull changes from the marvel branch on marvel into the local master branch
git pull marvel marvel
# Pulls from marvel, branch marvel