fix the shift+enter
This commit is contained in:
@@ -1 +1,8 @@
|
|||||||
font-family = "FiraCode Nerd Font Mono"
|
font-family = "FiraCode Nerd Font Mono"
|
||||||
|
|
||||||
|
background-opacity = 0.8
|
||||||
|
|
||||||
|
command = "/usr/bin/zsh -c 'tmux attach || tmux'"
|
||||||
|
initial-command = "/usr/bin/zsh -c 'tmux attach || tmux'"
|
||||||
|
|
||||||
|
keybind = shift+enter=text:\n
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/bash -e
|
#!/usr/bin/bash -e
|
||||||
branch=$(git status|head -1|cut -f3 -d\ )
|
branch=$(git status|head -1|cut -f3 -d\ )
|
||||||
git checkout main
|
git checkout $(git_main_branch)
|
||||||
git pull
|
git pull
|
||||||
git checkout "$branch"
|
git checkout "$branch"
|
||||||
git merge main
|
git merge $(git_main_branch)
|
||||||
|
|||||||
Reference in New Issue
Block a user