|
|
|
|
7
|
# 3. use `git am` to import patches back
|
7
|
# 3. use `git am` to import patches back
|
8
|
#
|
8
|
#
|
9
|
|
9
|
|
10
|
-/^\(--- a\|+++ b\)/ s:utils/mkit/include:src/include:g
|
|
|
11
|
-/^\(--- a\|+++ b\)/ s:utils/mkit/make:src/make.skel:g
|
|
|
12
|
-/^\(--- a\|+++ b\)/ s:utils/mkit/mkit.mk:src/mkit.mk:g
|
|
|
|
|
10
|
+/^\(--- a\|+++ b\|diff\)/ s:utils/mkit/include:src/include:g
|
|
|
11
|
+/^\(--- a\|+++ b\|diff\)/ s:utils/mkit/make:src/make.skel:g
|
|
|
12
|
+/^\(--- a\|+++ b\|diff\)/ s:utils/mkit/mkit.mk:src/mkit.mk:g
|
13
|
/^index / s:100755$:100644:
|
13
|
/^index / s:100755$:100644:
|