blob: 43f1c7f08248374ec2d6e8f5992da7fc85a80fd8 (
plain)
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
|
. /t/prompt/prompt test -d demo && rm -rf demo/ test -d ../demo && cd .. && rm -rf demo/ clear mkdir demo cd demo git init echo "1st line" > file git add file touch untracked-file rm untracked-file git commit -q -m "1st line" file git checkout -b test echo "added 2nd line in test" >> file git add file echo "2nd file" > file2 git add file2 echo "added 3nd line in file" >> file git add file git commit -q -m "2nd and 3rd lines" git checkout master cat file echo "now added 2nd line in master" >> file git add file git commit -q -m "2nd line" git merge test git-cat-file -p test:file > file git add file git commit -q -m "merged"
|