diff --git a/git.scmbrc.example b/git.scmbrc.example index a2d9113..a9bed89 100644 --- a/git.scmbrc.example +++ b/git.scmbrc.example @@ -59,6 +59,7 @@ git_fetch_alias="gf" git_fetch_all_alias="gfa" git_fetch_and_rebase_alias="gfr" git_pull_alias="gpl" +git_pull_rebase_alias="gplr" git_push_alias="gps" git_push_force_alias="gpsf" git_pull_then_push_alias="gpls" diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh index c11c74b..d09db2c 100644 --- a/lib/git/aliases.sh +++ b/lib/git/aliases.sh @@ -123,6 +123,7 @@ if [ "$git_setup_aliases" = "yes" ]; then __git_alias "$git_fetch_alias" 'git' 'fetch' __git_alias "$git_checkout_branch_alias" 'git' 'checkout' '-b' __git_alias "$git_pull_alias" 'git' 'pull' + __git_alias "$git_pull_rebase_alias" 'git' 'pull' '--rebase' __git_alias "$git_push_alias" 'git' 'push' __git_alias "$git_push_force_alias" 'git' 'push' '-f' __git_alias "$git_status_original_alias" 'git' 'status' # (Standard git status)