Skip to content

Instantly share code, notes, and snippets.

@dynnamitt

dynnamitt/squash.sh

Last active October 8, 2015 08:15
Show Gist options
  • Save dynnamitt/1eb602c3eda6e8869f94 to your computer and use it in GitHub Desktop.
Save dynnamitt/1eb602c3eda6e8869f94 to your computer and use it in GitHub Desktop.
Download ZIP
Git Pull PREPARE
Raw
squash.sh
# Switch to the master(or dev) branch and make sure you are up to date.
# Taken from http://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit
# ===================================================================================================
# ------ basically ggpull 1st;
git checkout dev
git fetch upstream # eller `git fetch origin` HVIS gatekeeper
git merge upstream/dev # eller `git pull` HVIS gatekeeper
# start here ;
# Merge the feature branch into the dev branch.
git merge *feature_branch*
# Reset the branch to prior state.
git reset upstream/dev # gatekeeper bruker `origin/dev`
# Git now considers all changes as unstaged changes.
# We can add these changes as one commit.
# Adding . will also add untracked files.
git checkout -b *My_Fresh_Pull_Branch* # Ikke for gatekeeper
git add --all
git commit
git push
# ------> make a PULL-Request on WWW
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment