To add to my previous answer, and to address the fact that a forced git push can really mess up other contributors’ local repos, git 1.8.5 (upcoming Q4 2013) will see a new option: git push –force-with-lease See the origin of that option in this thread: if something happens at ‘origin‘ to the branch you … Read more
This is a classic case of rebase –onto: # let’s go to current master (X, where quickfix2 should begin) git checkout master # replay every commit *after* quickfix1 up to quickfix2 HEAD. git rebase –onto master quickfix1 quickfix2 So you should go from o-o-X (master HEAD) \ q1a–q1b (quickfix1 HEAD) \ q2a–q2b (quickfix2 HEAD) to: … Read more
The –follow works for a particular file git log –follow — filename Difference to other solutions given Note that other solutions include git log path (without the –follow). That approach is handy if you want to track e.g. changes in a directory, but stumbles when files were renamed (thus use –follow filename).
Changing history If it is the most recent commit, you can simply do this: git commit –amend This brings up the editor with the last commit message and lets you edit the message. (You can use -m if you want to wipe out the old message and use a new one.) Pushing And then when … Read more
This behaviour is part of git commit‘s default ‘clean-up’ behaviour. If you want to keep lines starting with # you can use an alternative clean-up mode. E.g. git commit –cleanup=whitespace If you do this you have to be careful to remove all # lines that you don’t want to appear in the commit.
There are four ways of doing so: Clean way, reverting but keep in log the revert: git revert –strategy resolve <commit> Harsh way, remove altogether only the last commit: git reset –soft “HEAD^” Note: Avoid git reset –hard as it will also discard all changes in files since the last commit. If –soft does not … Read more
To push up through a given commit, you can write: git push <remotename> <commit SHA>:<remotebranchname> provided <remotebranchname> already exists on the remote. (If it doesn’t, you can use git push <remotename> <commit SHA>:refs/heads/<remotebranchname> to autocreate it.) If you want to push a commit without pushing previous commits, you should first use git rebase -i to … Read more
As mentioned in “Polling must die: triggering Jenkins builds from a git hook”, you can notify Jenkins of a new commit: With the latest Git plugin 1.1.14 (that I just release now), you can now do this more >easily by simply executing the following command: curl http://yourserver/jenkins/git/notifyCommit?url=<URL of the Git repository> This will scan all … Read more
Expanding what I wrote in a comment The general rule is that you should not rewrite (change) history that you have published, because somebody might have based their work on it. If you rewrite (change) history, you would make problems with merging their changes and with updating for them. So the solution is to create … Read more
git-rebase(1) does exactly that. $ git rebase -i HEAD~5 git awsome-ness [git rebase –interactive] contains an example. Don’t use git-rebase on public (remote) commits. Make sure your working directory is clean (commit or stash your current changes). Run the above command. It launches your $EDITOR. Replace pick before C and D by squash. It will … Read more