Git merge commits
25070
Squash my last X commits together using Git
115487
Git merge reports "Already up-to-date" though there is a difference
53060
How can I generate a Git patch for a specific commit?
32189
Git - how to force merge conflict and manual merge on selected file
52589
Mercurial: Merging one file between branches in one repo
105438
How do I find the merge that moved my changeset to another branch?
11257
How do I clone a single branch in Git?
89312
How to list branches that contain a given commit?
99229
How do I copy a version of a single file from one Git branch to another?
106905
Merge, update, and pull Git branches without using checkouts
12943
How to discard local commits in Git?
77443
Change first commit of project with Git?
31154
How do I work with a git repository within another repository?
74449
How can I selectively merge or pick changes from another branch in Git?
9534
How do you fix a bad merge, and replay your good commits onto a fixed merge?
84351
Git: Compare All Local Commits to Remote Repo Version
83711
How can I delete all Git branches which have been merged?