diff --git a/sh/alias/git.sh b/sh/alias/git.sh index 4519028..9875f68 100644 --- a/sh/alias/git.sh +++ b/sh/alias/git.sh @@ -8,7 +8,7 @@ C %C(blue)%ci %cn %ce %B" # add to index -ga() { a__git_add "${@}"; } +#= ga a__git_add() { git \ add \ @@ -16,7 +16,7 @@ a__git_add() { } # add all to index -gaa() { a__git_add_all "${@}"; } +#= gaa a__git_add_all() { git \ add \ @@ -25,7 +25,7 @@ a__git_add_all() { } # add parts of all to index -gaap() { a__git_add_all_patch "${@}"; } +#= gaap a__git_add_all_patch() { git \ add \ @@ -35,7 +35,7 @@ a__git_add_all_patch() { } # add parts to index -gap() { a__git_add_patch "${@}"; } +#= gap a__git_add_patch() { git \ add \ @@ -44,7 +44,7 @@ a__git_add_patch() { } # create a branch -gb() { a__git_branch "${@}"; } +#= gb a__git_branch() { git \ branch \ @@ -52,7 +52,7 @@ a__git_branch() { } # delete a branch -gbd() { a__git_branch_delete "${@}"; } +#= gbd a__git_branch_delete() { git \ branch \ @@ -61,7 +61,7 @@ a__git_branch_delete() { } # force a branch deletion -gbdf() { a__git_branch_delete_force "${@}"; } +#= gbdf a__git_branch_delete_force() { git \ branch \ @@ -71,7 +71,7 @@ a__git_branch_delete_force() { } # list branches -gbl() { a__git_branch_list "${@}"; } +#= gbl a__git_branch_list() { git \ branch \ @@ -83,7 +83,7 @@ a__git_branch_list() { } # set the link to a remote branch from a local branch -gbsu() { a__git_branch_set_upstream "${@}"; } +#= gbsu a__git_branch_set_upstream() { git \ branch \ @@ -92,7 +92,7 @@ a__git_branch_set_upstream() { } # switch to a branch or checkout file(s) from a commit -gc() { a__git_checkout "${@}"; } +#= gc a__git_checkout() { git \ checkout \ @@ -100,7 +100,7 @@ a__git_checkout() { } # checkout an orphan branch -gco() { a__git_checkout_orphan "${@}"; } +#= gco a__git_checkout_orphan() { git \ checkout \ @@ -109,7 +109,7 @@ a__git_checkout_orphan() { } # pick a commit -gcp() { a__git_cherry_pick "${@}"; } +#= gcp a__git_cherry_pick() { git \ cherry-pick \ @@ -117,7 +117,7 @@ a__git_cherry_pick() { } # abort the commit pick -gcpa() { a__git_cherry_pick_abort "${@}"; } +#= gcpa a__git_cherry_pick_abort() { git \ cherry-pick \ @@ -126,7 +126,7 @@ a__git_cherry_pick_abort() { } # continue the commit pick -gcpc() { a__git_cherry_pick_continue "${@}"; } +#= gcpc a__git_cherry_pick_continue() { git \ cherry-pick \ @@ -135,7 +135,7 @@ a__git_cherry_pick_continue() { } # clean untracked files -gcf() { a__git_clean_force "${@}"; } +#= gcf a__git_clean_force() { git \ clean \ @@ -145,7 +145,7 @@ a__git_clean_force() { } # redo the last commit with a different message -gcam() { a__git_commit_amend_message "${@}"; } +#= gcam a__git_commit_amend_message() { git \ commit \ @@ -155,7 +155,7 @@ a__git_commit_amend_message() { } # make a root commit -gcem() { a__git_commit_empty_message "${@}"; } +#= gcem a__git_commit_empty_message() { git \ commit \ @@ -166,7 +166,7 @@ a__git_commit_empty_message() { } # commit the index -gcm() { a__git_commit_message "${@}"; } +#= gcm a__git_commit_message() { git \ commit \ @@ -175,7 +175,7 @@ a__git_commit_message() { } # configure the user email -gcue() { a__git_config_user_email "${@}"; } +#= gcue a__git_config_user_email() { git \ config \ @@ -184,7 +184,7 @@ a__git_config_user_email() { } # configure the user name -gcun() { a__git_config_user_name "${@}"; } +#= gcun a__git_config_user_name() { git \ config \ @@ -193,7 +193,7 @@ a__git_config_user_name() { } # differences from last or between commits -gd() { a__git_diff "${@}"; } +#= gd a__git_diff() { git \ diff \ @@ -201,7 +201,7 @@ a__git_diff() { } # display what is indexed in cache -gdc() { a__git_diff_cached "${@}"; } +#= gdc a__git_diff_cached() { git \ diff \ @@ -210,7 +210,7 @@ a__git_diff_cached() { } # indexed character-level differences -gdcw() { a__git_diff_cached_word "${@}"; } +#= gdcw a__git_diff_cached_word() { git \ diff \ @@ -220,7 +220,7 @@ a__git_diff_cached_word() { } # differences via external tool -gdt() { a__git_diff_tool "${@}"; } +#= gdt a__git_diff_tool() { git \ difftool \ @@ -229,7 +229,7 @@ a__git_diff_tool() { } # character-level differences -gdw() { a__git_diff_word "${@}"; } +#= gdw a__git_diff_word() { git \ diff \ @@ -238,7 +238,7 @@ a__git_diff_word() { } # fetch from the remote repository -gf() { a__git_fetch "${@}"; } +#= gf a__git_fetch() { rwx_gpg_agent_update && git \ @@ -249,7 +249,7 @@ a__git_fetch() { } # fetch from remote repository and prune local orphan branches -gfp() { a__git_fetch_prune "${@}"; } +#= gfp a__git_fetch_prune() { a__git_fetch \ --prune \ @@ -257,7 +257,7 @@ a__git_fetch_prune() { } # garbage collect all orphan commits -ggc() { a__git_garbage_collect "${@}"; } +#= ggc a__git_garbage_collect() { git \ reflog \ @@ -271,7 +271,7 @@ a__git_garbage_collect() { } # initialize a new repository -gi() { a__git_init "${@}"; } +#= gi a__git_init() { git \ init \ @@ -279,7 +279,7 @@ a__git_init() { } # initialize a new bare repository -gib() { a__git_init_bare "${@}"; } +#= gib a__git_init_bare() { git \ init \ @@ -288,7 +288,7 @@ a__git_init_bare() { } # log history -gl() { a__git_log "${@}"; } +#= gl a__git_log() { git \ log \ @@ -300,7 +300,7 @@ a__git_log() { } # log all history -gla() { a__git_log_all "${@}"; } +#= gla a__git_log_all() { a__git_log \ --all \ @@ -308,7 +308,7 @@ a__git_log_all() { } # log all history as oneline -glao() { a__git_log_all_oneline "${@}"; } +#= glao a__git_log_all_oneline() { a__git_log_all \ --oneline \ @@ -316,7 +316,7 @@ a__git_log_all_oneline() { } # log all history with patches -glap() { a__git_log_all_patch "${@}"; } +#= glap a__git_log_all_patch() { a__git_log \ --all \ @@ -325,7 +325,7 @@ a__git_log_all_patch() { } # log history as oneline -glo() { a__git_log_oneline "${@}"; } +#= glo a__git_log_oneline() { a__git_log \ --oneline \ @@ -333,7 +333,7 @@ a__git_log_oneline() { } # log history with patches -glp() { a__git_log_patch "${@}"; } +#= glp a__git_log_patch() { a__git_log \ --patch \ @@ -341,7 +341,7 @@ a__git_log_patch() { } # fast-forward merge to remote branch -gm() { a__git_merge "${@}"; } +#= gm a__git_merge() { git \ merge \ @@ -350,7 +350,7 @@ a__git_merge() { } # abort the current merge commit -gma() { a__git_merge_abort "${@}"; } +#= gma a__git_merge_abort() { git \ merge \ @@ -359,7 +359,7 @@ a__git_merge_abort() { } # do a merge commit -gmc() { a__git_merge_commit "${@}"; } +#= gmc a__git_merge_commit() { git \ merge \ @@ -369,7 +369,7 @@ a__git_merge_commit() { } # squash a branch and index its modifications -gms() { a__git_merge_squash "${@}"; } +#= gms a__git_merge_squash() { git \ merge \ @@ -378,7 +378,7 @@ a__git_merge_squash() { } # merge via external tool -gmt() { a__git_merge_tool "${@}"; } +#= gmt a__git_merge_tool() { git \ mergetool \ @@ -386,7 +386,7 @@ a__git_merge_tool() { } # push to the remote repository -gp() { a__git_push "${@}"; } +#= gp a__git_push() { rwx_gpg_agent_update && git \ @@ -397,7 +397,7 @@ a__git_push() { } # delete from the remote repository -gpd() { a__git_push_delete "${@}"; } +#= gpd a__git_push_delete() { git \ push \ @@ -406,7 +406,7 @@ a__git_push_delete() { } # force the push to the remote repository -gpf() { a__git_push_force "${@}"; } +#= gpf a__git_push_force() { a__git_push \ --force \ @@ -414,7 +414,7 @@ a__git_push_force() { } # rebase current branch onto another -grb() { a__git_re_base "${@}"; } +#= grb a__git_re_base() { git \ rebase \ @@ -422,7 +422,7 @@ a__git_re_base() { } # abort current rebase -grba() { a__git_re_base_abort "${@}"; } +#= grba a__git_re_base_abort() { git \ rebase \ @@ -431,7 +431,7 @@ a__git_re_base_abort() { } # continue current rebase -grbc() { a__git_re_base_continue "${@}"; } +#= grbc a__git_re_base_continue() { git \ rebase \ @@ -440,7 +440,7 @@ a__git_re_base_continue() { } # force rebase without fast-forward -grbf() { a__git_re_base_force "${@}"; } +#= grbf a__git_re_base_force() { git \ rebase \ @@ -449,7 +449,7 @@ a__git_re_base_force() { } # rebase interactively -grbi() { a__git_re_base_interactive "${@}"; } +#= grbi a__git_re_base_interactive() { git \ rebase \ @@ -458,7 +458,7 @@ a__git_re_base_interactive() { } # add a new remote repository -grma() { a__git_re_mote_add "${@}"; } +#= grma a__git_re_mote_add() { git \ remote \ @@ -467,7 +467,7 @@ a__git_re_mote_add() { } # list remote repositories -grml() { a__git_re_mote_list "${@}"; } +#= grml a__git_re_mote_list() { git \ remote \ @@ -476,7 +476,7 @@ a__git_re_mote_list() { } # set the location of a remote repository -grmsu() { a__git_re_mote_set_upstream "${@}"; } +#= grmsu a__git_re_mote_set_upstream() { git \ remote \ @@ -485,7 +485,7 @@ a__git_re_mote_set_upstream() { } # show connection to a remote repository -grms() { a__git_re_mote_show "${@}"; } +#= grms a__git_re_mote_show() { git \ remote \ @@ -494,7 +494,7 @@ a__git_re_mote_show() { } # remove and add removal to index -grm() { a__git_re_move "${@}"; } +#= grm a__git_re_move() { git \ rm \ @@ -502,7 +502,7 @@ a__git_re_move() { } # remove file(s) from index or move current branch pointer -grs() { a__git_re_set "${@}"; } +#= grs a__git_re_set() { git \ reset \ @@ -510,7 +510,7 @@ a__git_re_set() { } # wipe modifications or reset current branch to another commit -grsh() { a__git_re_set_hard "${@}"; } +#= grsh a__git_re_set_hard() { git \ reset \ @@ -519,7 +519,7 @@ a__git_re_set_hard() { } # current state of repository -gs() { a__git_status "${@}"; } +#= gs a__git_status() { git \ status \ @@ -528,7 +528,7 @@ a__git_status() { } # show a commit -#( gsc +#= gsc a__git_show_commit() { git \ show \ @@ -536,7 +536,7 @@ a__git_show_commit() { } # tag a commit -gt() { a__git_tag "${@}"; } +#= gt a__git_tag() { git \ tag \ @@ -544,7 +544,7 @@ a__git_tag() { } # delete a tag -gtd() { a__git_tag_delete "${@}"; } +#= gtd a__git_tag_delete() { git \ tag \ @@ -553,7 +553,7 @@ a__git_tag_delete() { } # update head ref -gurh() { a__git_update_ref_head "${@}"; } +#= gurh a__git_update_ref_head() { if [ -n "${2}" ]; then git \ diff --git a/sh/main.awk b/sh/main.awk index a64d8cd..2bcc4d5 100644 --- a/sh/main.awk +++ b/sh/main.awk @@ -27,7 +27,7 @@ BEGIN { RE_END = RE_SPACES "$" RE_FUNC = RE_SPACES "\\(" RE_SPACES "\\)" RE_SPACES "{" - RE_ALIAS = RE_BEGIN "#\\(" RE_SPACES RE_VAR RE_END + RE_ALIAS = RE_BEGIN "#=" RE_SPACES RE_VAR RE_END RE_CONSTANT = RE_BEGIN RE_CONST RE_SET RE_END RE_DOC = RE_BEGIN "#" RE_SPACE RE_ANY RE_END RE_FUNCTION = RE_BEGIN RE_VAR RE_FUNC RE_END