From 9e24890de6a9f28939d8d06db572dd919a642900 Mon Sep 17 00:00:00 2001 From: Josh Hagins Date: Mon, 19 Jan 2015 22:49:07 -0500 Subject: [PATCH] Add alias for git pull --rebase --- git.scmbrc.example | 1 + lib/git/aliases.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/git.scmbrc.example b/git.scmbrc.example index e6566de..74f9db1 100644 --- a/git.scmbrc.example +++ b/git.scmbrc.example @@ -57,6 +57,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 c7f8fc6..3addc1d 100644 --- a/lib/git/aliases.sh +++ b/lib/git/aliases.sh @@ -114,6 +114,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)