From 6bf770986522ef89b7a56c12c40c8cdbf1872b70 Mon Sep 17 00:00:00 2001
From: William Hilton <william.hilton@ge.com>
Date: Tue, 9 Jan 2018 16:37:49 -0500
Subject: [PATCH] Alias "fast-forward"

---
 README.md | 1 +
 bin/g     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 91627f1..a7c1e7b 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,7 @@ g fetch | Fetches all remotes and fast-forwards local branches when possible
 g fetch *branches* | Fetches and fast-forwards the specified branches
 g push | pushes to upstream. <ul><li> If upstream not set, prompt user to name a remote branch. </li> <li> If multiple remotes exist, prompt for which remote to use. </li></ul>
 g remote | Interactive prompt to add a remote.
+g ff | git pull --ff-only
 
 \* To save your Github username where `get` can see it: `git config --global github.user your_user_name`
 
diff --git a/bin/g b/bin/g
index 0c67bfb..2254750 100755
--- a/bin/g
+++ b/bin/g
@@ -312,6 +312,10 @@ for local_branch in $branches; do
 done
 ;;
 
+ff)
+git pull --ff-only
+;;
+
 ignore)
 GIT_ROOT=$(git_root)
 CWD=$(pwd)