git merge multiple commit to one

http://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit

git discard changes to a file


git checkout -f -- "filename"
Note, there is a space between -- and "filename".

Other methods:
git checkout -f

=========================================
To discard local commits:

git reset --hard origin/master

git send-email

http://morefedora.blogspot.com/2009/02/configuring-git-send-email-to-use-gmail.html

http://felipec.wordpress.com/2009/10/25/git-send-email-tricks/

The newbie's guide to hacking the Linux kernel

http://tuxradar.com/content/newbies-guide-hacking-linux-kernel

git book:

http://book.git-scm.com/index.html

HOWTO: Create and submit your first Linux kernel patch using GIT
http://linux.koolsolutions.com/2011/02/26/howto-create-and-submit-your-first-linux-kernel-patch/

Git - SVN crash Course:

http://git.or.cz/course/svn.html

git merge and conflict:

http://genomewiki.ucsc.edu/index.php/Resolving_merge_conflicts_in_Git

http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html

http://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html