Git

From ArchWiki
Revision as of 19:14, 20 June 2011 by Thestinger (talk | contribs) (Installation)
Jump to: navigation, search

Tango-document-new.pngThis article is a stub.Tango-document-new.png

Notes: please use the first argument of the template to provide more detailed indications. (Discuss in Talk:Git#)
Template:Article summary start

Template:Article summary text Template:Article summary heading Template:Article summary wiki: Generally about contributing to pacman, although it still serves as a practical Git tutorial Template:Article summary wiki Template:Article summary end

Git is the version control system (VCS) coded by Linus Torvalds (the creator of the Linux kernel) after being criticized for using the proprietary BitKeeper with the Linux kernel. Git is now used to maintain sources for the Linux kernel as well as thousands of other projects, including Pacman, Arch's package manager.

There is extensive documentation, guides, and tutorials available from the official web site.

Installation

Template:Package Official can be installed with pacman as usual from the [extra] repository. Pay attention to the optional dependencies if you care about using Git with other VCS software, mail servers, or using Git's GUI.

Bash completion (eg. hitting tab to complete commands you are typing) should work if you

source /usr/share/git/completion/git-completion.bash

Alternatively, you can install the Template:Package Official package to load the completions automatically for new shells.

If you want to use Git's built-in GUI (eg. Template:Codeline or Template:Codeline) you should install the Template:Package Official package or you'll get a rather cryptic message:

/usr/bin/gitk: line 3: exec: wish: not found.

Cheatsheet

Parts from everywhere, much from the wonderful tutorial here: http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html

Additionally see Super Quick Git Guide.

Pull the network scripts with

git clone http://archlinux.org/~james/projects/network.git

Update an existing clone

git pull origin

Commit changes

git commit -a -m "changelog message"

To create a new branch

git branch somebranch

Change to a different branch

git checkout differentbranch

Merge a branch to current active branch

git merge somebranch

Delete a branch

git branch -d somebranch

Diff between two branches

git diff master..somebranch

Diff between two commit ID's (found in git log)

git diff e9780c7cba2855350e914fde227a79bb63c1351d..8b014e40346b38b3b9bfc41359b4e8a68e804c0d

Diff between the last two commits

git diff HEAD^ HEAD

Patchset between two branches (follows same syntax as git diff afaik)

git format-patch master..somebranch

Or better: http://wiki.winehq.org/GitWine#head-f7a29e7ed999b5924748a60c5a1cd4a019032d26

git format-patch -o out origin

Set nano as default editor

git config --global core.editor "nano -w"

Start remote repository http://www.adeal.eu/starting-with-git.php [broken as of 31DEC10]