mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-22 06:58:01 +00:00
Merged
This commit is contained in:
commit
35a83744e7
@ -1 +1 @@
|
||||
Subproject commit 955645c22b29434caefadcb7d541d570d40ae932
|
||||
Subproject commit 8ec8c8c5c662c3cb77231b7458ce1975d2f8c967
|
2
modules/prompt/external/agnoster
vendored
2
modules/prompt/external/agnoster
vendored
@ -1 +1 @@
|
||||
Subproject commit 3ad94b659910c775a6560c45b1524d23d8c83b09
|
||||
Subproject commit 6bba672c7812a76defc3efed9b6369eeee2425dc
|
@ -1 +1 @@
|
||||
Subproject commit d6586e2a4f54a66808aba3c325a614d5166342f8
|
||||
Subproject commit e900ad8bad53501689afcb050456400d7a8466e5
|
@ -6,7 +6,7 @@ cd ~/.zprezto
|
||||
|
||||
git fetch upstream
|
||||
git checkout master
|
||||
git merge -m "Merged" upstream/master
|
||||
git merge -m "Merge upstream/master" upstream/master
|
||||
git submodule update --init --recursive
|
||||
|
||||
cd -
|
||||
|
Loading…
Reference in New Issue
Block a user