Merge remote-tracking branch 'refs/remotes/origin/master'

common/lazygit.yaml

@@ -208,9 +208,6 @@ git:
   autoStageResolvedConflicts: true
   # Command used when displaying the current branch git log in the main window
   branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --
-    # Command used to display git log of all branches in the main window.
-    # Deprecated: Use `allBranchesLogCmds` instead.
-    allBranchesLogCmd: git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium
   # If true, do not spawn a separate process when using GPG
   overrideGpg: false
   # If true, do not allow force pushes
@@ -244,6 +241,8 @@ git:
   # When copying commit hashes to the clipboard, truncate them to this
   # length. Set to 40 to disable truncation.
   truncateCopiedCommitHashesTo: 12
+  allBranchesLogCmds:
+    - git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium
 # Periodic update checks
 update:
   # One of: 'prompt' (default) | 'background' | 'never'

platforms/mac/yabairc

@@ -54,6 +54,7 @@ yabai -m rule --add app="iTerm2" manage=off
 yabai -m rule --add app="Raycast" manage=off
 yabai -m rule --add app="^System Information$" sticky=on manage=off
 yabai -m rule --add app="^System Settings$" sticky=on manage=off
+yabai -m rule --add title="^Zotero Settings$" sticky=on manage=off
 
 borders active_color="gradient(top_left=0xffff9e64,bottom_right=0xffbb9af7)" inactive_color="gradient(top_left=0x40ff9e64,bottom_right=0x40bb9af7)" width=5 2>/dev/null 1>&2 &