-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathmake-branches
executable file
·51 lines (49 loc) · 1000 Bytes
/
make-branches
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
38
39
40
41
42
43
44
45
46
47
48
49
50
#!/bin/sh
# %s/^git checkout master/git rebase master \rgit checkout master/g
# %s/^git merge/git merge --no-ff/g
git checkout master
git branch -D start-here
git branch start-here
git branch f1
echo "text" >> README.md
git add .
git commit -m"A commit on master"
git branch f2
git checkout f1
echo "text" > file-1a
git add .
git commit -m"Adding file 1a"
echo "text" > file-1b
git add .
git commit -m"Adding file 1b"
git branch f4
git checkout master
git merge f1
git branch f3
git checkout f2
echo "text" > file-2a
git add .
git commit -m"Adding file 2a"
echo "text" > file-2b
git add .
git commit -m"Adding file 2b"
git checkout master
git merge f2
git checkout f3
echo "text" > file-3a
git add .
git commit -m"Adding file 3a"
echo "text" > file-3b
git add .
git commit -m"Adding file 3b"
git checkout master
git merge f3
git checkout f4
echo "text" > file-4a
git add .
git commit -m"Adding file 4a"
echo "text" > file-4b
git add .
git commit -m"Adding file 4b"
git checkout master
git merge f4