summaryrefslogtreecommitdiff
path: root/bin/git-merge-ff
Commit message (Expand)AuthorAge
* use shebangs more consistentlySean Whitton2022-12-10
* git-merge-ff: handle branches checked out in other worktreesSean Whitton2022-10-18
* add trailing '--' to git-diff(1) call in git-merge-ffSean Whitton2017-06-30
* tweak message when branch already up-to-dateSean Whitton2017-02-16
* git-merge-ff doesn't output a diff when nothing changedSean Whitton2017-02-16
* s/u/upstream for readabilitySean Whitton2017-02-16
* make git-merge-ff's second parameter optionalSean Whitton2017-02-16
* import git-merge-ff from Stack OverflowSean Whitton2017-02-16