VirtualTam's bookmarks

1. Fix conflicts only once with git rerere 2015-06-11

   tags: conflict, diff, merge, rebase, source-code-management/git

   [ permalink ]

   Original article: http://www.git-attitude.fr/2014/11/04/git-rerere/ Official doc: http://git-scm.com/docs/git-rerere