diff --git a/README.md b/README.md
index ebf9206..5ae3445 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,8 @@ configuration:
 * Adds a `create-branch` alias to create feature branches.
 * Adds a `delete-branch` alias to delete feature branches.
 * Adds a `merge-branch` alias to merge feature branches into master.
+* Adds an `up` alias to fetch and rebase `origin/master` into the feature
+  branch. Use `git up -i` for interactive rebases.
 
 Shell aliases and scripts:
 
diff --git a/gitconfig b/gitconfig
index b45a433..2913116 100644
--- a/gitconfig
+++ b/gitconfig
@@ -12,8 +12,8 @@
   delete-branch = !sh -c 'git push origin :refs/heads/$1 && git remote prune origin && git branch -D $1' -
   merge-branch = !git checkout master && git merge @{-1}
   pr = !hub pull-request
-  rebase-origin = !git fetch origin && git rebase origin/master
   st = status
+  up = !git fetch origin && git rebase origin/master
 [core]
   excludesfile = ~/.gitignore
   autocrlf = input