Merge feature/tmux-pane-moves-hooks-failclosed into develop

This commit is contained in:
bchanot committed 2026-10-09 09:26:47 +02:00
commit 280f592175
2 files changed
+16

No files matched your search

+4
View File
@@ -8,6 +8,10 @@ Format: [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). Versioning: se
### Added
- `install.sh` asks the gitflow push mode (`gitflow.autopush`, exactly `true` or `false`, Enter = `true`) and writes it to `~/.gitconfig`; an existing value is reused, `DOTFILES_GITFLOW_AUTOPUSH` presets it, any other preset aborts the install.
- `gitconfig`: fixed `core.hooksPath = ~/.claude/githooks`.
- `tmux.conf`: move panes between windows — `J`/`L` join the marked pane below/beside, `S` swaps it with the current one, `(`/`)` (repeatable) move the pane to the previous/next slot.
### Changed
- `.githooks/post-commit` and `post-merge` fail closed on `gitflow.autopush`: an unreadable or non-boolean value means no push, with a named warning (was: silently treated as `true`).
### Fixed
- `~/.gitconfig` was deployed with the literal `@USER@` / `@EMAIL@` placeholders: the installer read the identity from the repo bashrc template instead of the answers.
+12
View File
@@ -187,6 +187,18 @@ bind-key l "split-window -h -c '#{pane_current_path}'"
bind-key i "split-window -h -c '#{pane_current_path}'" # i: side by side (vertical bar)
bind-key - "split-window -v -c '#{pane_current_path}'" # -: stacked (horizontal bar)
# Move panes between windows and around. Source = the marked pane (prefix m,
# toggles) when one is set, else the current pane. Prefix ! (stock break-pane)
# does the reverse: current pane out to a new window.
bind-key J join-pane -v # marked pane joins this window, below (mirrors j)
bind-key L join-pane -h # marked pane joins this window, beside (mirrors l)
bind-key S swap-pane # swap marked pane with the current one
# Stock { } (swap-pane -U/-D) sit behind alt+( alt+) on a Mac AZERTY keyboard.
# ( ) are unshifted there, and repeatable; they replace switch-client -p/-n,
# which prefix s (choose-tree) still covers.
bind-key -r ( swap-pane -U # move pane up / left (previous slot)
bind-key -r ) swap-pane -D # move pane down / right (next slot)
bind q kill-window # Kill window
bind Q kill-session # Kill the session (not server)
bind C-c neww \; set status on # enable status bar