====== Git ======

[[wpde>Git]] Source Code Managementsystem (SCM), die verteilte Alternative zu CVS (→[[wpde>Versionsverwaltung]]). 

  * www.git-scm.com -- Homepage\\ {{:soft:beer.png?nolink&24|}}{{:soft:winxp.png?nolink&24|}} <wrap download>[[http://git-scm.com/download/win|Download Windows Build]]</wrap>

  * [[http://git-scm.com/downloads/guis|Graphical User Interface (GUI) Clients for Git]]\\ <wrap tip>[[https://gitextensions.github.io/|Git Extensions]] -- The only graphical user interface for Git that allows you control Git without using the commandline.</wrap>\\ {{:soft:beer.png?nolink&24|}}{{:soft:winxp.png?nolink&24|}} <wrap download>[[http://gitextensions.googlecode.com/files/GitExtensions243SetupComplete.msi|Download Git Extensions for Windows]]</wrap>

===== Getting Started =====

  - Download installer.
  - Run installer and accept defaults.
  - First time Git setup (per user) [(http://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup)].<code>
$ git config --global user.name "John Doe"
$ git config --global user.email johndoe@example.com
#$ git config --global core.editor emacs
#$ git config --global merge.tool vimdiff
</code>

~~REFNOTES~~

===== File Manager Integration =====

  * **www.tortoisegit.org** -- The coolest (User-)Interface to Git Version Control\\ {{:soft:beer.png?nolink}} {{:soft:gnu.png?nolink}} {{:soft:winxp.png?nolink}}

  * **[[http://rabbitvcs.org/|RabbitVCS]]** provide simple and straightforward access to the version control systems. It is integrated into the Nautilus and Thunar file managers, the Gedit text editor, and supports Subversion and Git.\\ {{:soft:beer.png?nolink}} {{:soft:gnu.png?nolink}} {{:soft:linux.png?nolink}}

===== Documentation =====

==== User's Manual ====

  * <wrap info>http://www-cs-students.stanford.edu/~blynn/gitmagic/</wrap>
  * <wrap info>http://wiki.sourcemage.org/Git_Guide_Pre-1.5</wrap>
  * <wrap info>[[https://tortoisegit.org/docs/tortoisegit/|TortoiseGit Manual]]</wrap>

==== Quick Reference ====

  * [[http://rogerdudler.github.io/git-guide/index.de.html|git - Der einfache Einstieg - kein Schnick-schnack!]]
  * [[http://www.kernel.org/pub/software/scm/git/docs/v1.6.2/everyday.html|Everyday GIT With 20 Commands Or So]]
  * {{https://docs.freitagsrunde.org/Veranstaltungen/techtalk/2011/git-cheatsheet.pdf|Git – der Spickzettel}}

==== Tutorial ====

  * [[https://nathanj.github.io/gitguide/tour.html|An Illustrated Guide to Git on Windows]] [(https://web.archive.org/web/20180810065001/https://nathanj.github.io/gitguide/tour.html)]

~~REFNOTES~~

==== Wiki ====

  * [[http://www.spheredev.org/wiki/Git_for_the_lazy|Git for the lazy]]

==== Every Day Git ====

  * [[https://www.heise.de/developer/artikel/Die-vielfaeltigen-Faehigkeiten-von-Git-Teil-1-4456122.html?seite=all|Die vielfältigen Fähigkeiten von Git, Teil 1]] [(https://web.archive.org/web/20190706091752/https://www.heise.de/developer/artikel/Die-vielfaeltigen-Faehigkeiten-von-Git-Teil-1-4456122.html?seite=all)]
===== Frequently Asked Questions (FAQ) and Answers =====

  * [[https://stackoverflow.com/questions/9864728/how-to-get-git-to-clone-into-current-directory|How to get Git to clone into current directory]]
  * [[https://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-file-mode-chmod-changes|How do I make Git ignore file mode (chmod) changes?]]
  * [[http://groovy-skills.com/rails/2012/04/09/git-repositories-zusammenfuhren-git-pull/|Git Repositories zusammenführen (git pull)]]
  * [[http://genomewiki.ucsc.edu/index.php/Resolving_merge_conflicts_in_Git|Resolving merge conflicts in Git]]
  * [[http://www.gitguys.com/topics/merging-with-a-gui/|Git Mergetool – Merging With a GUI]]
  * [[https://www.ralfebert.de/git/commits-nachbessern/|Commits nachbessern (amend), rückgängig machen (revert), verwerfen (reset)]]
  * [[https://stackoverflow.com/questions/1427785/how-to-set-desired-language-in-git-gui|How to set desired language in git-gui?]]


==== Cross platform issues (UNIX versus Windows) ====

  * [[https://stackoverflow.com/questions/170961/whats-the-best-crlf-carriage-return-line-feed-handling-strategy-with-git|What's the best CRLF (carriage return, line feed) handling strategy with Git?]]
  * [[https://help.github.com/articles/dealing-with-line-endings/|Dealing with line endings]]
  * [[http://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf|git replacing LF with CRLF]]
  * [[http://stackoverflow.com/questions/1249932/git-1-6-4-beta-on-windows-msysgit-unix-or-dos-line-termination|Git on Windows (msysgit) - Unix or DOS line termination]]
  * [[http://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-file-mode-chmod-changes|How do I make Git ignore file mode (chmod) changes?]]

==== CVS and SVN \$Id:\$ Replacement for Git ====

  * [[https://stackoverflow.com/questions/384108/moving-from-cvs-to-git-id-equivalent|Moving from CVS to git: \$Id:\$ equivalent?]]
  * [[https://stackoverflow.com/questions/16524225/how-can-i-populate-the-git-commit-id-into-a-file-when-i-commit|How can I populate the Git commit ID into a file when I commit?]]
  * [[https://stackoverflow.com/questions/1792838/how-do-i-enable-ident-string-for-git-repos|How do I enable ident string for Git repos?]]
  * [[http://git-scm.com/book/ch7-2.html#keyword_expansion|Customizing Git - Git Attributes]] -- Keyword Expansion

==== Git mergetool with Meld on Windows ====

  * http://stackoverflow.com/questions/14821358/git-mergetool-with-meld-on-windows

===== Known Issues =====

  * [[http://stackoverflow.com/questions/6866913/git-commit-on-windows-cygwin-is-broken|Git commit on Windows (Cygwin) is broken.]]

===== Recommendet Reading =====

  * [[https://git-scm.com/book/en/v2|The entire Pro Git book]] -- //written by Scott Chacon and Ben Straub//