diff options
| author | Erich Eckner <git@eckner.net> | 2021-03-26 19:36:50 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-03-26 19:36:50 +0100 |
| commit | bfeb24a1464ec2045b08294372e1d222056c20cb (patch) | |
| tree | 3b82439b00c9787d2c070b684fe344b6e45d1d5b | |
| parent | f1eb659fbfd53032df1c2134ee949926f266cfe3 (diff) | |
| download | archlinuxewe-bfeb24a1464ec2045b08294372e1d222056c20cb.tar.xz | |
update-submodule: git pull --rebase statt git pull --ff-only
| -rwxr-xr-x | update-submodule | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/update-submodule b/update-submodule index 326cbe3c6..17fd1339e 100755 --- a/update-submodule +++ b/update-submodule @@ -29,6 +29,6 @@ if [ -d "${submoduleDir}" ]; then else upstream="${pkgSrcDir}/${path}" fi -git -C "${upstream}" pull -q --ff-only +git -C "${upstream}" pull -q --rebase git -C "${upstream}" archive "${commit}" \ | tar -C "${path}" -x |