Skip to content
forked from Xender/git-fff

Git fast-fast-forward - ff a branch without checkout.

License

Notifications You must be signed in to change notification settings

jsternberg/git-fff

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

4 Commits
 
 
 
 
 
 
 
 

Repository files navigation

git-fff

Git fast-fast-forward - ff a branch without checkout.

Usage

git fff <branch> [<committish-to-merge>]

If is not given, it will default to HEAD.

Description

I once wanted to fast-forward master to tested revision from dev branch, but had a dirty working tree. The usual workaround is like this:

stash; checkout master; merge --ff-only tested_revision; checkout dev; stash pop;

I wanted something that doesn't require typing 5 command nor unnecessary data shuffling (stashing, which is pretty much pointless in this case).

This script is basically wrapper for git update-ref that makes fast-forwardness sanity-check and fallbacks to merge --ff-only in corner case of fff'ing current branch. That's it ^ ^.

Zsh completion

Zsh completion script included, make sure to put it in some directory in your $fpath.

About

Git fast-fast-forward - ff a branch without checkout.

Resources

License

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages

  • Shell 100.0%