git merge, bring back my changes
15543
git merge: Removing files I want to keep!
37401
Undo working copy modifications of one file in Git?
158486
Development with git branches/ gitflow and new modules
16239
How do I make a Git commit in the past?
56435
Can I easily update all local git branches from remote branches simultaneously?
122624
How to get a list of all files that changed between two Git commits?
127786
How do I 'git diff' on a certain directory?
32189
Git - how to force merge conflict and manual merge on selected file
8982
Can I recover a branch after its deletion in Git?
75430
How to convert a normal Git repository to a bare one?
74449
How can I selectively merge or pick changes from another branch in Git?
125914
Eclipse git checkout (aka, revert)
153352
What's the simplest way to list conflicted files in Git?
16500
How do you merge two Git repositories?
144299
Move commits from master onto a branch using git
125970
How to revert multiple git commits?
59710
Edit the root commit in Git?