diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-16 11:42:40 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-02-16 11:42:40 -0700 |
| commit | d891fcbd46d0244ae808bdd8d9368e666678f275 (patch) | |
| tree | c637b5f184f585388abf45a273980f5e8869cb7c /bin/git-merge-ff | |
| parent | 4eafea4da2ef482745f3e0f7eb05765488223a0a (diff) | |
| download | dotfiles-d891fcbd46d0244ae808bdd8d9368e666678f275.tar.gz | |
s/u/upstream for readability
Diffstat (limited to 'bin/git-merge-ff')
| -rwxr-xr-x | bin/git-merge-ff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/git-merge-ff b/bin/git-merge-ff index 06b5557a..d2179bc5 100755 --- a/bin/git-merge-ff +++ b/bin/git-merge-ff @@ -55,6 +55,6 @@ shift $((OPTIND-1)) case $# in 2 ) _merge_ff "$1" "$2";; - 1 ) _merge_ff "$1" "${1}@{u}";; + 1 ) _merge_ff "$1" "${1}@{upstream}";; * ) _usage esac |