lijingjiang

Table Of Content

Skip to the relevant sections if needed.

• 2-min tutorial to do it the quick-and-dirty-way
• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
  • Resolving conflict from a Git pull
• Other great references and tutorials

lijingjiang

#===============================================================
# FROM,
# 1. http://tldp.org/LDP/abs/html/sample-bashrc.html
# 2. git://github.com/chenkaie/DotFiles.git

# Source global definitions (if any)
if [ -f /etc/bashrc ]; then
    . /etc/bashrc   # --> Read /etc/bashrc, if present.
fi

lijingjiang

[apply]
	whitespace = nowarn
[user]
	name = Chen Bin
	email =chenbin.sh@gmail.com
[core]
	# @see http://comments.gmane.org/gmane.comp.version-control.git/166098
	filemode = true
	ignorecase = false
	autocrlf = false