equal
deleted
inserted
replaced
23 |
23 |
24 mkdir git-repo |
24 mkdir git-repo |
25 cd git-repo |
25 cd git-repo |
26 git init-db >/dev/null 2>/dev/null |
26 git init-db >/dev/null 2>/dev/null |
27 echo a > a |
27 echo a > a |
28 git add a |
28 mkdir d |
29 commit -m t1 |
29 echo b > d/b |
|
30 git add a d |
|
31 commit -a -m t1 |
|
32 |
|
33 # Remove the directory, then try to replace it with a file |
|
34 # (issue 754) |
|
35 git rm -r d |
|
36 commit -m t2 |
|
37 echo d > d |
|
38 git add d |
|
39 commit -m t3 |
30 |
40 |
31 echo b >> a |
41 echo b >> a |
32 commit -a -m t2.1 |
42 commit -a -m t4.1 |
33 |
43 |
34 git checkout -b other HEAD^ >/dev/null 2>/dev/null |
44 git checkout -b other HEAD^ >/dev/null 2>/dev/null |
35 echo c > a |
45 echo c > a |
36 echo a >> a |
46 echo a >> a |
37 commit -a -m t2.2 |
47 commit -a -m t4.2 |
38 |
48 |
39 git checkout master >/dev/null 2>/dev/null |
49 git checkout master >/dev/null 2>/dev/null |
40 git pull --no-commit . other > /dev/null 2>/dev/null |
50 git pull --no-commit . other > /dev/null 2>/dev/null |
41 commit -m 'Merge branch other' |
51 commit -m 'Merge branch other' |
42 cd .. |
52 cd .. |