Archives

Archive for the ‘Git’ Category

To delete a remote branch, run: git push origin :branch

May 31st, 2011 | Filed under Git

If you have configuration files or any other files in the local repository that you would like to keep as they are without the danger of adding them by mistake in a commit, you can specify that using the local git exclude file and update-index.

Jan 17th, 2011 | Filed under Git

If you need to solve a conflict in git but for some reason you can’t use the git markers to decide what to keep and what to remove from a file, then you can use git show and your favorite visual diff tool to solve the conflict.

Aug 13th, 2010 | Filed under Git

If a new commit somehow overrides the changes from a previous commit, then you can re-apply the previous commit over the current one by using the cherry-pick command.

Apr 10th, 2010 | Filed under Git