diff options
| author | sommerfeld <sommerfeld@sommerfeld.dev> | 2026-08-14 14:21:05 +0100 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2026-08-14 14:21:05 +0100 |
| commit | 843c58efa32d334c9f06d22229728ab72deb2160 (patch) | |
| tree | d458e224240a24257caaea9683df79f8521910d1 /dot_config/git | |
| parent | ac632546177ff4b2ebd1d878fea87a3deea0040d (diff) | |
| download | dotfiles-843c58efa32d334c9f06d22229728ab72deb2160.tar.gz dotfiles-843c58efa32d334c9f06d22229728ab72deb2160.tar.bz2 dotfiles-843c58efa32d334c9f06d22229728ab72deb2160.zip | |
Default ghost rebase to origin/main
Diffstat (limited to 'dot_config/git')
| -rw-r--r-- | dot_config/git/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dot_config/git/config b/dot_config/git/config index 56e14be..a554e3b 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -87,7 +87,7 @@ autoStageIfNothingStaged = true [alias] resign = "!git show -s --format=%B HEAD | sed \"/^Co-authored-by:/Id\" | git -c core.hooksPath=/dev/null commit --amend --reset-author --no-verify --cleanup=strip -S -F -" - ghost-rebase = "!sh -c 'b=$0; u=${1:-origin/master}; wt=$(mktemp -d -t rebwt.XXXXXX); git worktree add -f "$wt" "$b"; git -C "$wt" rebase "$u" || echo "Rebase incomplete"; git worktree remove --force "$wt"'" + ghost-rebase = "!sh -c 'b=$0; u=${1:-origin/main}; wt=$(mktemp -d -t rebwt.XXXXXX); git worktree add -f "$wt" "$b"; git -C "$wt" rebase "$u" || echo "Rebase incomplete"; git worktree remove --force "$wt"'" a = add ab=absorb --and-rebase b = branch -vv |