From 9fe31181ed172d1e7ae6a8b0edea6f4a88cc427e Mon Sep 17 00:00:00 2001 From: Owen Jacobson Date: Thu, 26 Sep 2024 00:18:42 -0400 Subject: Reinstate `git ff` --- bin/git-ff | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 bin/git-ff (limited to 'bin/git-ff') diff --git a/bin/git-ff b/bin/git-ff new file mode 100755 index 0000000..e497c61 --- /dev/null +++ b/bin/git-ff @@ -0,0 +1,5 @@ +#!/bin/bash -e + +# Attempt to fast-forward merge with another branch. + +exec git merge --ff --ff-only "$@" -- cgit v1.2.3