git rebase -i can handle your last request (interactively combine/remove/move history). In fact, git can also handle your second wish by having simply creating

git rebase -i can handle your last request (interactively combine/remove/move history). In fact, git can also handle your second wish by having simply creating a "sync" branch pointing to that extra commit, then when you switch to between your laptop and desktop, pull the sync branch, check out the commit (apply it to your working directory), then switch back to the master branch and continue working (the commit never appears in the master branch). Git rebase would handle the "forced commit on merge with no meaningful conflicts". hope I don't sound like too much of a fanboy :)