git reset --hard HEAD^

git push origin newfeature

git fetch

Branch removing_mozilla_days set up to track remote branch removing_mozilla_days from origin.

to see which (remote) branches exist:

git branch -av

After that, to push to this remote branch:

git push origin removing_mozilla_days

squashing commits with rebase

Working on removing features (mozilla, xmas, etc), we use a remote branch so 2 developers can pair:

A -- B -- C  master 
         /
         D -- E -- F -- G removing_mozilla   (lots of small commits)

In order to be able to reproduce what exactly is contained in the feature 'mozilla', we want to merge it into master with one commit. (squash-merge)

We want:

A -- B -- C  -- H (squash D, E, F and G)     master 
         /                   \
         D -- E -- F -- G removing_mozilla

Make sure your branch has the lastest changes from master

Rebase against the upstream frequently to prevent your branch from diverging significantly:

git fetch origin master
git rebase origin/master

NB: This is often done by checking master out and pulling, but this method requires extra steps:

git checkout master
git pull
git checkout 3275-add-commenting
git rebase master

rebase with the interactive option to squash several (or all) of your commits into a single commit

git rebase -i master

1. Rebase 60709da..30e0ccb onto 60709da
2. Commands:
3. p, pick = use commit
4. e, edit = use commit, but stop for amending
5. s, squash = use commit, but meld into previous commit #
6. If you remove a line here THAT COMMIT WILL BE LOST.
7. However, if you remove everything, the rebase will be aborted.

Basically this tells Git to combine all four commits into the the first commit in the list.

Combine commit messages

1. This is a combination of 4 commits.
2. The first commit's message is:
   Adding license

1. This is the 2nd commit message:
   Moving license into its own file

Since we’re combining so many commits, Git allows you to modify the new commit’s message based on the rest of the commits involved in the process. Edit the message as you see fit, then save and quit. Once that’s done, your commits have been successfully squashed!

Merge with master branch

git checkout master
git merge removing_mozilla
rake tests:run_before_commit
git push

Do not forget to clean up and remove the remote branch with

git push origin :removing_mozilla_days

More info, see http://www.gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

git rerere

http://pivotallabs.com/users/khicks/blog/articles/2119-git-config-rerere-enabled-true

Revert a merge

We need to be able to reproduce what exactly is contained in the xmas calendar.
So please make sure to do this change in a branch, and merge it into master with one commit. (squash-merge).

Unfortunately, I have forgotten a few files and then Fabian and Jan pushed. This is the state of my git tree is:

A (JM) -- B merge result (JM 962cf1) -- C (fdi) -- D (fdi) -- E(js) master

First, I want to create a remote branch to not to loose my work:

A(JM)-- B merge result (JM) -- C (fdi) -- D (fdi) -- E(js) master
              /
            B  remove_xmas branch

git branch remove_xmas_calendar 962cf1

And then I want to revert the merge so master is clean:

git revert -n 962cf1cf0e -m 1

git commit . -m "reverted merge of remove_xmas_calendar as I have forgotten the js and want to ask Fabian to review my changes. I have do$ git commit . -m "reverted merge of remove_xmas_calendar as I have forgotten the js and want to ask Fabian to review my changes." 

git push

Have a look to http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt for more explanations

deleting old remote branches

1) remove tracking of remote branches that don't exist anymore

git remote prune origin

2) list all remote branches

git br -r

3) delete remote branches you don't need anymore

git push origin :search_indexer_refactorings

cherry-pick

Tricks

github open source projects guide