This commit is contained in:
Marc Beninca 2025-07-27 13:29:07 +02:00
parent 10d267383f
commit 11a4b0cdc7
Signed by: marc.beninca
GPG key ID: 9C7613450C80C24F

View file

@ -13,7 +13,7 @@ RWX_GIT_LOG_FORMAT_SHORT="%C(auto)%h %C(green)%ad %C(auto)%s %d"
# add to index # add to index
#= ga #= ga
a__git_add() { rwx_git_add() {
git \ git \
add \ add \
"${@}" "${@}"
@ -21,7 +21,7 @@ a__git_add() {
# add all to index # add all to index
#= gaa #= gaa
a__git_add_all() { rwx_git_add_all() {
git \ git \
add \ add \
--all \ --all \
@ -30,7 +30,7 @@ a__git_add_all() {
# add parts of all to index # add parts of all to index
#= gaap #= gaap
a__git_add_all_patch() { rwx_git_add_all_patch() {
git \ git \
add \ add \
--all \ --all \
@ -40,7 +40,7 @@ a__git_add_all_patch() {
# add parts to index # add parts to index
#= gap #= gap
a__git_add_patch() { rwx_git_add_patch() {
git \ git \
add \ add \
--patch \ --patch \
@ -49,7 +49,7 @@ a__git_add_patch() {
# create a branch # create a branch
#= gb #= gb
a__git_branch() { rwx_git_branch() {
git \ git \
branch \ branch \
"${@}" "${@}"
@ -57,7 +57,7 @@ a__git_branch() {
# delete a branch # delete a branch
#= gbd #= gbd
a__git_branch_delete() { rwx_git_branch_delete() {
git \ git \
branch \ branch \
--delete \ --delete \
@ -66,7 +66,7 @@ a__git_branch_delete() {
# force a branch deletion # force a branch deletion
#= gbdf #= gbdf
a__git_branch_delete_force() { rwx_git_branch_delete_force() {
git \ git \
branch \ branch \
--delete \ --delete \
@ -76,7 +76,7 @@ a__git_branch_delete_force() {
# list branches # list branches
#= gbl #= gbl
a__git_branch_list() { rwx_git_branch_list() {
git \ git \
branch \ branch \
--all \ --all \
@ -88,7 +88,7 @@ a__git_branch_list() {
# set the link to a remote branch from a local branch # set the link to a remote branch from a local branch
#= gbsu #= gbsu
a__git_branch_set_upstream() { rwx_git_branch_set_upstream() {
git \ git \
branch \ branch \
--set-upstream-to \ --set-upstream-to \
@ -97,7 +97,7 @@ a__git_branch_set_upstream() {
# switch to a branch or checkout file(s) from a commit # switch to a branch or checkout file(s) from a commit
#= gc #= gc
a__git_checkout() { rwx_git_checkout() {
git \ git \
checkout \ checkout \
"${@}" "${@}"
@ -105,7 +105,7 @@ a__git_checkout() {
# checkout an orphan branch # checkout an orphan branch
#= gco #= gco
a__git_checkout_orphan() { rwx_git_checkout_orphan() {
git \ git \
checkout \ checkout \
--orphan \ --orphan \
@ -114,7 +114,7 @@ a__git_checkout_orphan() {
# pick a commit # pick a commit
#= gcp #= gcp
a__git_cherry_pick() { rwx_git_cherry_pick() {
git \ git \
cherry-pick \ cherry-pick \
"${@}" "${@}"
@ -122,7 +122,7 @@ a__git_cherry_pick() {
# abort the commit pick # abort the commit pick
#= gcpa #= gcpa
a__git_cherry_pick_abort() { rwx_git_cherry_pick_abort() {
git \ git \
cherry-pick \ cherry-pick \
--abort \ --abort \
@ -131,7 +131,7 @@ a__git_cherry_pick_abort() {
# continue the commit pick # continue the commit pick
#= gcpc #= gcpc
a__git_cherry_pick_continue() { rwx_git_cherry_pick_continue() {
git \ git \
cherry-pick \ cherry-pick \
--continue \ --continue \
@ -140,7 +140,7 @@ a__git_cherry_pick_continue() {
# clean untracked files # clean untracked files
#= gcf #= gcf
a__git_clean_force() { rwx_git_clean_force() {
git \ git \
clean \ clean \
-d \ -d \
@ -150,7 +150,7 @@ a__git_clean_force() {
# redo the last commit with a different message # redo the last commit with a different message
#= gcam #= gcam
a__git_commit_amend_message() { rwx_git_commit_amend_message() {
git \ git \
commit \ commit \
--amend \ --amend \
@ -160,7 +160,7 @@ a__git_commit_amend_message() {
# make a root commit # make a root commit
#= gcem #= gcem
a__git_commit_empty_message() { rwx_git_commit_empty_message() {
git \ git \
commit \ commit \
--allow-empty \ --allow-empty \
@ -171,7 +171,7 @@ a__git_commit_empty_message() {
# commit the index # commit the index
#= gcm #= gcm
a__git_commit_message() { rwx_git_commit_message() {
git \ git \
commit \ commit \
--message \ --message \
@ -180,7 +180,7 @@ a__git_commit_message() {
# configure the user email # configure the user email
#= gcue #= gcue
a__git_config_user_email() { rwx_git_config_user_email() {
git \ git \
config \ config \
"user.email" \ "user.email" \
@ -189,7 +189,7 @@ a__git_config_user_email() {
# configure the user name # configure the user name
#= gcun #= gcun
a__git_config_user_name() { rwx_git_config_user_name() {
git \ git \
config \ config \
"user.name" \ "user.name" \
@ -198,7 +198,7 @@ a__git_config_user_name() {
# differences from last or between commits # differences from last or between commits
#= gd #= gd
a__git_diff() { rwx_git_diff() {
git \ git \
diff \ diff \
"${@}" "${@}"
@ -206,7 +206,7 @@ a__git_diff() {
# display what is indexed in cache # display what is indexed in cache
#= gdc #= gdc
a__git_diff_cached() { rwx_git_diff_cached() {
git \ git \
diff \ diff \
--cached \ --cached \
@ -215,7 +215,7 @@ a__git_diff_cached() {
# indexed character-level differences # indexed character-level differences
#= gdcw #= gdcw
a__git_diff_cached_word() { rwx_git_diff_cached_word() {
git \ git \
diff \ diff \
--cached \ --cached \
@ -225,7 +225,7 @@ a__git_diff_cached_word() {
# differences via external tool # differences via external tool
#= gdt #= gdt
a__git_diff_tool() { rwx_git_diff_tool() {
git \ git \
difftool \ difftool \
--dir-diff \ --dir-diff \
@ -234,7 +234,7 @@ a__git_diff_tool() {
# character-level differences # character-level differences
#= gdw #= gdw
a__git_diff_word() { rwx_git_diff_word() {
git \ git \
diff \ diff \
--word-diff-regex "." \ --word-diff-regex "." \
@ -243,7 +243,7 @@ a__git_diff_word() {
# fetch from the remote repository # fetch from the remote repository
#= gf #= gf
a__git_fetch() { rwx_git_fetch() {
rwx_gpg_agent_update && rwx_gpg_agent_update &&
git \ git \
fetch \ fetch \
@ -254,15 +254,15 @@ a__git_fetch() {
# fetch from remote repository and prune local orphan branches # fetch from remote repository and prune local orphan branches
#= gfp #= gfp
a__git_fetch_prune() { rwx_git_fetch_prune() {
a__git_fetch \ rwx_git_fetch \
--prune \ --prune \
"${@}" "${@}"
} }
# garbage collect all orphan commits # garbage collect all orphan commits
#= ggc #= ggc
a__git_garbage_collect() { rwx_git_garbage_collect() {
git \ git \
reflog \ reflog \
expire \ expire \
@ -276,7 +276,7 @@ a__git_garbage_collect() {
# initialize a new repository # initialize a new repository
#= gi #= gi
a__git_init() { rwx_git_init() {
git \ git \
init \ init \
"${@}" "${@}"
@ -284,7 +284,7 @@ a__git_init() {
# initialize a new bare repository # initialize a new bare repository
#= gib #= gib
a__git_init_bare() { rwx_git_init_bare() {
git \ git \
init \ init \
--bare \ --bare \
@ -293,7 +293,7 @@ a__git_init_bare() {
# log history # log history
#= gl #= gl
a__git_log() { rwx_git_log() {
git \ git \
log \ log \
--abbrev=8 \ --abbrev=8 \
@ -306,24 +306,24 @@ a__git_log() {
# log all history # log all history
#= gla #= gla
a__git_log_all() { rwx_git_log_all() {
a__git_log \ rwx_git_log \
--all \ --all \
"${@}" "${@}"
} }
# log all history as oneline # log all history as oneline
#= glao #= glao
a__git_log_all_oneline() { rwx_git_log_all_oneline() {
a__git_log_all \ rwx_git_log_all \
--format="${RWX_GIT_LOG_FORMAT_SHORT}" \ --format="${RWX_GIT_LOG_FORMAT_SHORT}" \
"${@}" "${@}"
} }
# log all history with patches # log all history with patches
#= glap #= glap
a__git_log_all_patch() { rwx_git_log_all_patch() {
a__git_log \ rwx_git_log \
--all \ --all \
--patch \ --patch \
"${@}" "${@}"
@ -331,23 +331,23 @@ a__git_log_all_patch() {
# log history as oneline # log history as oneline
#= glo #= glo
a__git_log_oneline() { rwx_git_log_oneline() {
a__git_log \ rwx_git_log \
--format="${RWX_GIT_LOG_FORMAT_SHORT}" \ --format="${RWX_GIT_LOG_FORMAT_SHORT}" \
"${@}" "${@}"
} }
# log history with patches # log history with patches
#= glp #= glp
a__git_log_patch() { rwx_git_log_patch() {
a__git_log \ rwx_git_log \
--patch \ --patch \
"${@}" "${@}"
} }
# fast-forward merge to remote branch # fast-forward merge to remote branch
#= gm #= gm
a__git_merge() { rwx_git_merge() {
git \ git \
merge \ merge \
--ff-only \ --ff-only \
@ -356,7 +356,7 @@ a__git_merge() {
# abort the current merge commit # abort the current merge commit
#= gma #= gma
a__git_merge_abort() { rwx_git_merge_abort() {
git \ git \
merge \ merge \
--abort \ --abort \
@ -365,7 +365,7 @@ a__git_merge_abort() {
# do a merge commit # do a merge commit
#= gmc #= gmc
a__git_merge_commit() { rwx_git_merge_commit() {
git \ git \
merge \ merge \
--no-ff \ --no-ff \
@ -375,7 +375,7 @@ a__git_merge_commit() {
# squash a branch and index its modifications # squash a branch and index its modifications
#= gms #= gms
a__git_merge_squash() { rwx_git_merge_squash() {
git \ git \
merge \ merge \
--squash \ --squash \
@ -384,7 +384,7 @@ a__git_merge_squash() {
# merge via external tool # merge via external tool
#= gmt #= gmt
a__git_merge_tool() { rwx_git_merge_tool() {
git \ git \
mergetool \ mergetool \
"${@}" "${@}"
@ -392,7 +392,7 @@ a__git_merge_tool() {
# push to the remote repository # push to the remote repository
#= gp #= gp
a__git_push() { rwx_git_push() {
rwx_gpg_agent_update && rwx_gpg_agent_update &&
git \ git \
push \ push \
@ -403,7 +403,7 @@ a__git_push() {
# delete from the remote repository # delete from the remote repository
#= gpd #= gpd
a__git_push_delete() { rwx_git_push_delete() {
git \ git \
push \ push \
--delete \ --delete \
@ -412,15 +412,15 @@ a__git_push_delete() {
# force the push to the remote repository # force the push to the remote repository
#= gpf #= gpf
a__git_push_force() { rwx_git_push_force() {
a__git_push \ rwx_git_push \
--force \ --force \
"${@}" "${@}"
} }
# rebase current branch onto another # rebase current branch onto another
#= grb #= grb
a__git_re_base() { rwx_git_re_base() {
git \ git \
rebase \ rebase \
"${@}" "${@}"
@ -428,7 +428,7 @@ a__git_re_base() {
# abort current rebase # abort current rebase
#= grba #= grba
a__git_re_base_abort() { rwx_git_re_base_abort() {
git \ git \
rebase \ rebase \
--abort \ --abort \
@ -437,7 +437,7 @@ a__git_re_base_abort() {
# continue current rebase # continue current rebase
#= grbc #= grbc
a__git_re_base_continue() { rwx_git_re_base_continue() {
git \ git \
rebase \ rebase \
--continue \ --continue \
@ -446,7 +446,7 @@ a__git_re_base_continue() {
# force rebase without fast-forward # force rebase without fast-forward
#= grbf #= grbf
a__git_re_base_force() { rwx_git_re_base_force() {
git \ git \
rebase \ rebase \
--force-rebase \ --force-rebase \
@ -455,7 +455,7 @@ a__git_re_base_force() {
# rebase interactively # rebase interactively
#= grbi #= grbi
a__git_re_base_interactive() { rwx_git_re_base_interactive() {
git \ git \
rebase \ rebase \
--interactive \ --interactive \
@ -464,7 +464,7 @@ a__git_re_base_interactive() {
# add a new remote repository # add a new remote repository
#= grma #= grma
a__git_re_mote_add() { rwx_git_re_mote_add() {
git \ git \
remote \ remote \
add \ add \
@ -473,7 +473,7 @@ a__git_re_mote_add() {
# list remote repositories # list remote repositories
#= grml #= grml
a__git_re_mote_list() { rwx_git_re_mote_list() {
git \ git \
remote \ remote \
--verbose \ --verbose \
@ -482,7 +482,7 @@ a__git_re_mote_list() {
# set the location of a remote repository # set the location of a remote repository
#= grmsu #= grmsu
a__git_re_mote_set_upstream() { rwx_git_re_mote_set_upstream() {
git \ git \
remote \ remote \
set-url \ set-url \
@ -491,7 +491,7 @@ a__git_re_mote_set_upstream() {
# show connection to a remote repository # show connection to a remote repository
#= grms #= grms
a__git_re_mote_show() { rwx_git_re_mote_show() {
git \ git \
remote \ remote \
show \ show \
@ -500,7 +500,7 @@ a__git_re_mote_show() {
# remove and add removal to index # remove and add removal to index
#= grm #= grm
a__git_re_move() { rwx_git_re_move() {
git \ git \
rm \ rm \
"${@}" "${@}"
@ -508,7 +508,7 @@ a__git_re_move() {
# remove file(s) from index or move current branch pointer # remove file(s) from index or move current branch pointer
#= grs #= grs
a__git_re_set() { rwx_git_re_set() {
git \ git \
reset \ reset \
"${@}" "${@}"
@ -516,7 +516,7 @@ a__git_re_set() {
# wipe modifications or reset current branch to another commit # wipe modifications or reset current branch to another commit
#= grsh #= grsh
a__git_re_set_hard() { rwx_git_re_set_hard() {
git \ git \
reset \ reset \
--hard \ --hard \
@ -525,7 +525,7 @@ a__git_re_set_hard() {
# current state of repository # current state of repository
#= gs #= gs
a__git_status() { rwx_git_status() {
git \ git \
status \ status \
--untracked-files="all" \ --untracked-files="all" \
@ -534,7 +534,7 @@ a__git_status() {
# show a commit # show a commit
#= gsc #= gsc
a__git_show_commit() { rwx_git_show_commit() {
git \ git \
show \ show \
"${@}" "${@}"
@ -542,7 +542,7 @@ a__git_show_commit() {
# tag a commit # tag a commit
#= gt #= gt
a__git_tag() { rwx_git_tag() {
git \ git \
tag \ tag \
"${@}" "${@}"
@ -550,7 +550,7 @@ a__git_tag() {
# delete a tag # delete a tag
#= gtd #= gtd
a__git_tag_delete() { rwx_git_tag_delete() {
git \ git \
tag \ tag \
--delete \ --delete \
@ -559,7 +559,7 @@ a__git_tag_delete() {
# update head ref # update head ref
#= gurh #= gurh
a__git_update_ref_head() { rwx_git_update_ref_head() {
if [ -n "${2}" ]; then if [ -n "${2}" ]; then
git \ git \
update-ref \ update-ref \