diff options
| author | Jesse Luehrs <doy@tozt.net> | 2023-09-17 11:17:56 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2023-09-17 11:38:20 -0400 |
| commit | 66939c71da756c1d9e07a88a4a8ea2a018650060 (patch) | |
| tree | 38c0f516d561d1b23d3ebceb0a28f43e9d7e6464 /config | |
| parent | d72c1614d26e1a54c012bfeff8f5dbc327b9d2af (diff) | |
| download | conf-66939c71da756c1d9e07a88a4a8ea2a018650060.tar.gz conf-66939c71da756c1d9e07a88a4a8ea2a018650060.zip | |
add support for git-branchless
Diffstat (limited to 'config')
| -rw-r--r-- | config/git/config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/git/config b/config/git/config index 1406069..b8092d8 100644 --- a/config/git/config +++ b/config/git/config @@ -4,7 +4,7 @@ [alias] aliases = !git config --get-regexp 'alias.*' | perl -nle'/^alias\\.([^ ]*) (.*)/ && printf \"%-15s = %s\\n\", $1, $2' alias = "!f() { local name=$1; shift; git config --global alias.$name \"$*\"; }; f" - amend = !git add -p && git commit --amend + amend = !~/.bin/git/git-amend bda = "!f() { git branch --merged $(git default-branch) --format='%(refname:short)' | grep -v \"^$(git default-branch)$\" | xargs -r git branch -d; }; f" blame-stats = !~/.bin/git/git-blame-stats br = for-each-ref --sort=committerdate refs/heads/ --format='%(align:30,left)%(HEAD) %(refname:short)%(end) %(color:magenta)(%(committerdate:relative))' @@ -21,7 +21,7 @@ lg = log --graph --pretty=format:'%Cred%h%Creset%C(yellow)%d%Creset %C(bold blue)%aN%Creset %C(magenta)(%ar)%Creset%n%s%n' --abbrev-commit --date=relative --stat=72 pr = !~/.bin/git/git-pr prune-all = !git remote | xargs -n 1 git remote prune - record = !git add -p && git commit --verbose + record = !~/.bin/git/git-record refix = "!f() { env EDITOR=true git rebase -i \"$@\"; }; f" re = rebase -i @{u} ri = rebase -i @@ -30,7 +30,7 @@ stashed = stash list --pretty=format:'%<(10)%gd: %Cred%h%Creset %Cgreen(%ar)%Creset%n %s' st = status -sb start = "!f() { git commit --allow-empty -m 'initial commit' && git add . && git commit -m 'project skeleton'; }; f" - track = "!f() { local name=$(git name-rev --name-only @); git branch --set-upstream-to=origin/$name $name; }; f" + track = "!f() { local name=$(git name-rev --name-only --exclude='branchless/*' @); git branch --set-upstream-to=origin/$name $name; }; f" [github] user = doy [color] |