fix the shift+enter

This commit is contained in:
2026-06-06 11:30:21 -04:00
parent c03ee8019e
commit d3e5e47c01
2 changed files with 9 additions and 2 deletions

View File

@@ -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

View File

@@ -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)