diff options
Diffstat (limited to 'test.sh')
-rwxr-xr-x | test.sh | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -35,7 +35,10 @@ git fetch ../subproj sub1 git branch sub1 FETCH_HEAD git read-tree --prefix=subdir FETCH_HEAD git checkout subdir -git commit -m 'initial-subdir-merge' +tree=$(git write-tree) +com=$(echo initial-subdir-merge | git commit-tree $tree -p HEAD -p FETCH_HEAD) +git reset $com +#git commit -m 'initial-subdir-merge' git merge -m 'merge -s -ours' -s ours FETCH_HEAD |