mirror of
https://github.com/dcarrillo/prezto.git
synced 2025-07-01 06:59:25 +00:00
Add some new git aliases, modify a few more. (#1301)
* Add some new git aliases, modify a few more. * Add `gbV` command to show more verbose git branch info. * Add `gcam` to make it possible to execute `gca; gcm '<your message here>'` more simply. * Add `gii` command to temporarily untrack (ignore) a file. * Add `giI` command to uningore a file. * Change alias of `gbl` to `gbv`. Personally, I think aliases that include a switch in the command should include the switch in the alias if possible. This makes them easier to remember. * Change alias of `gbL` to `gba`. I think the `-a` switch is more salient to what this alias does than the `-v`. Furthermore, with this PR there are already `gbv` and `gbV` aliases, so those are out. * Change implementation of `gCl` alias to use built-in capabilities of git, rather than sed. * Rename gbx and gbX to gbd and gbD respectively * Mostly revert alias changes * Add gbr and gbR aliases to gbm and gbM commands
This commit is contained in:
@ -32,20 +32,28 @@ if ! zstyle -t ':prezto:module:git:alias' skip 'yes'; then
|
||||
|
||||
# Branch (b)
|
||||
alias gb='git branch'
|
||||
alias gba='git branch --all --verbose'
|
||||
alias gbc='git checkout -b'
|
||||
alias gbl='git branch -v'
|
||||
alias gbL='git branch -av'
|
||||
alias gbx='git branch -d'
|
||||
alias gbX='git branch -D'
|
||||
alias gbm='git branch -m'
|
||||
alias gbM='git branch -M'
|
||||
alias gbd='git branch --delete'
|
||||
alias gbD='git branch --delete --force'
|
||||
alias gbl='git branch --verbose'
|
||||
alias gbL='git branch --all --verbose'
|
||||
alias gbm='git branch --move'
|
||||
alias gbM='git branch --move --force'
|
||||
alias gbr='git branch --move'
|
||||
alias gbR='git branch --move --force'
|
||||
alias gbs='git show-branch'
|
||||
alias gbS='git show-branch -a'
|
||||
alias gbS='git show-branch --all'
|
||||
alias gbv='git branch --verbose'
|
||||
alias gbV='git branch --verbose --verbose'
|
||||
alias gbx='git branch --delete'
|
||||
alias gbX='git branch --delete --force'
|
||||
|
||||
# Commit (c)
|
||||
alias gc='git commit --verbose'
|
||||
alias gca='git commit --verbose --all'
|
||||
alias gcm='git commit --message'
|
||||
alias gcam='git commit --all --message'
|
||||
alias gco='git checkout'
|
||||
alias gcO='git checkout --patch'
|
||||
alias gcf='git commit --amend --reuse-message HEAD'
|
||||
@ -58,7 +66,7 @@ if ! zstyle -t ':prezto:module:git:alias' skip 'yes'; then
|
||||
alias gcl='git-commit-lost'
|
||||
|
||||
# Conflict (C)
|
||||
alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
|
||||
alias gCl='git --no-pager diff --name-only --diff-filter=U'
|
||||
alias gCa='git add $(gCl)'
|
||||
alias gCe='git mergetool $(gCl)'
|
||||
alias gCo='git checkout --ours --'
|
||||
@ -159,6 +167,8 @@ if ! zstyle -t ':prezto:module:git:alias' skip 'yes'; then
|
||||
alias giu='git add --update'
|
||||
alias gid='git diff --no-ext-diff --cached'
|
||||
alias giD='git diff --no-ext-diff --cached --word-diff'
|
||||
alias gii='git update-index --assume-unchanged'
|
||||
alias giI='git update-index --no-assume-unchanged'
|
||||
alias gir='git reset'
|
||||
alias giR='git reset --patch'
|
||||
alias gix='git rm -r --cached'
|
||||
|
Reference in New Issue
Block a user