From Fedora Project Wiki

Line 34: Line 34:
* [http://www.viget.com/extend/only-you-can-prevent-git-merge-commits/ you can prevent git merge conflicts by rebasing true]
* [http://www.viget.com/extend/only-you-can-prevent-git-merge-commits/ you can prevent git merge conflicts by rebasing true]
* http://jocr.sourceforge.net/ GOCR] -> GOCR is an OCR (Optical Character Recognition) program
* http://jocr.sourceforge.net/ GOCR] -> GOCR is an OCR (Optical Character Recognition) program
* [http://stackoverflow.com/questions/936249/git-removing-a-file-from-source-control-but-not-from-the-source git rm --cached <file>] - git diff --cached

Revision as of 14:46, 27 January 2012