bahostetterlewis · December 17, 2015 00:19
diff --git a/git_aliases.txt b/git_aliases.txt
 git config --global alias.ignorechanges = update-index --assume-unchanged
 git config --global alias.noticechanges = update-index --no-assume-unchanged
diff --git a/git_commands.txt b/git_commands.txt
 git log --pretty=oneline
 git log --graph --pretty=oneline
 git diff <branch1> <branch2> --word-diff
 git checkout --theirs -- <file> # key here is the -- says end of params
 git checkout --ours -- <file> # This solves simple conflicts
 git pull <remote> +branch:mybranch #overwrite my changes with those on the remove
	git config --global alias.ignorechanges = update-index --assume-unchanged
	git config --global alias.noticechanges = update-index --no-assume-unchanged
	git log --pretty=oneline
	git log --graph --pretty=oneline
	git diff <branch1> <branch2> --word-diff
	git checkout --theirs -- <file> # key here is the -- says end of params
	git checkout --ours -- <file> # This solves simple conflicts
	git pull <remote> +branch:mybranch #overwrite my changes with those on the remove