Skip to content

Instantly share code, notes, and snippets.

@cromwellryan

cromwellryan/git-merge-ff-only.sh

Last active July 12, 2018 13:43
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save cromwellryan/74c79598f9e0f2d5fe38 to your computer and use it in GitHub Desktop.
Save cromwellryan/74c79598f9e0f2d5fe38 to your computer and use it in GitHub Desktop.
Download ZIP
Code for Git-Poooosh post
Raw
git-merge-ff-only.sh
$> git merge --ff-only fancy-feature-branch
Updating 020fbbd..0d154e9
Fast-forward
README.md | 2 ++
1 file changed, 2 insertions(+)
Raw
git-poooosh.sh
$> git push && git push origin :fancy-feature-branch && git branch -d fancy-feature-branch
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:cromwellryan/dotfiles
020fbbd..0d154e9 master -> master
To git@github.com:cromwellryan/dotfiles
- [deleted] fancy-feature-branch
Deleted branch fancy-feature-branch (was 0d154e9).
Raw
gpp.sh
$> gpp fancy-feature-branch
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:cromwellryan/dotfiles
020fbbd..0d154e9 master -> master
To git@github.com:cromwellryan/dotfiles
- [deleted] fancy-feature-branch
Deleted branch fancy-feature-branch (was 0d154e9).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment