diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2024-09-26 00:18:42 -0400 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2024-09-26 00:18:42 -0400 |
| commit | 9fe31181ed172d1e7ae6a8b0edea6f4a88cc427e (patch) | |
| tree | 03711223d01a8c3a14b81fabc18d020e1bded661 | |
| parent | 9b281a821e7cced9e7ab2ee762292c110902e29c (diff) | |
| -rwxr-xr-x | bin/git-ff | 5 |
1 files changed, 5 insertions, 0 deletions
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 "$@" |