Not merging a file in Git?
115773
"selectively" merging with git
13861
Change merge shortcut?
106905
Merge, update, and pull Git branches without using checkouts
42249
Using Visual Studio 2012's built-in merge tool with Git
37234
Is there any way to merge documents together?
21105
Browse and display files in a git repo without cloning
82444
How to remove/delete a large file from commit history in Git repository?
122314
How to undo "git commit --amend" done instead of "git commit"
65577
Remove a file from a Git repository without deleting it from the local filesystem
127856
I ran into a merge conflict. How can I abort the merge?
104660
Split a commit into smaller commits with Git?
15543
git merge: Removing files I want to keep!
112299
Git: How to remove file from historical commit?
155368
Git: Can I commit my working directory to a new branch without committing it to a current branch?
63809
How does git detect that a file has been modified?
34410
Move existing, uncommitted work to a new branch in Git
85044
git creates files ending in ~?