chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable'
[stgit]
/
t
/
t1201-pull-trailing.sh
diff --git
a/t/t1201-pull-trailing.sh
b/t/t1201-pull-trailing.sh
index 8a748737b4cab3b66ef3dffec18035645a8dd45d..3a7efc1f434e40fb703a30963602c375363e876d 100755
(executable)
--- a/
t/t1201-pull-trailing.sh
+++ b/
t/t1201-pull-trailing.sh
@@
-29,9
+29,9
@@
test_expect_success \
test_expect_success \
'Port those patches to orig tree' \
'(cd foo &&
- GIT_DIR=../bar/.git git
-
format-patch --stdout \
+ GIT_DIR=../bar/.git git
format-patch --stdout \
$(cd ../bar && stg id master:{base})..HEAD |
- git
-
am -3 -k
+ git
am -3 -k
)
'