diff options
author | Stephan Koglin-Fischer | 2023-12-21 16:16:13 +0100 |
---|---|---|
committer | Stephan Koglin-Fischer | 2023-12-21 16:16:13 +0100 |
commit | d6d921ae3d9459a2df183ce6b2603b232b4fddad (patch) | |
tree | a307914816e5dfc6c2135843fbb6e09ecde5d8cd | |
parent | 6fd74d4257cb948052c80bba676f66cd66a8c79d (diff) | |
download | aur-d6d921ae3d9459a2df183ce6b2603b232b4fddad.tar.gz |
feat: git merge aur master with no edit
-rw-r--r-- | justfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -67,7 +67,7 @@ publish: prepare @echo -e "\e[36mSwitching to aur master branch...\e[0m" @git checkout master @echo -e "\e[36mMerging main into aur master...\e[0m" - @git merge -X theirs main + @git merge -X theirs --no-edit main @echo -e "\e[36mPushing to aur...\e[0m" @git push aur master @echo -e "\e[36mSwitching back to main...\e[0m" |