2011-04-20 12:29:01 +00:00
<?xml version="1.0" encoding="utf-8"?>
< !DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
< html xmlns = "http://www.w3.org/1999/xhtml" lang = "fr" xml:lang = "fr" >
< head >
< meta http-equiv = "Content-Type" content = "text/html; charset=UTF-8" / >
< meta name = "keywords" content = "git" >
2011-04-20 13:56:52 +00:00
< link rel = "shortcut icon" type = "image/x-icon" href = "/Scratch/img/favicon.ico" / >
< link rel = "stylesheet" type = "text/css" href = "/Scratch/assets/css/main.css" / >
2012-04-02 21:43:39 +00:00
< link rel = "stylesheet" type = "text/css" href = "/Scratch/css/solarized.css" / >
2011-04-20 13:56:52 +00:00
< link rel = "stylesheet" type = "text/css" href = "/Scratch/css/idc.css" / >
2012-05-02 15:43:56 +00:00
< link href = 'http://fonts.googleapis.com/css?family=Inconsolata' rel = 'stylesheet' type = 'text/css' >
2011-04-20 12:29:01 +00:00
< link rel = "alternate" type = "application/rss+xml" title = "RSS" href = "http://feeds.feedburner.com/yannespositocomen" / >
2011-04-20 13:56:52 +00:00
< link rel = "alternate" lang = "fr" xml:lang = "fr" title = "Git pour les nuls" type = "text/html" hreflang = "fr" href = "/Scratch/fr/blog/2009-11-12-Git-for-n00b/conf-et-install/" / >
< link rel = "alternate" lang = "en" xml:lang = "en" title = "Git for n00b" type = "text/html" hreflang = "en" href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/conf-et-install/" / >
< script type = "text/javascript" src = "/Scratch/js/jquery-1.3.1.min.js" > < / script >
< script type = "text/javascript" src = "/Scratch/js/jquery.cookie.js" > < / script >
< script type = "text/javascript" src = "/Scratch/js/index.js" > < / script >
2012-05-02 15:43:56 +00:00
< script type = "text/javascript" src = "/Scratch/js/highlight/highlight.pack.js" > < / script >
< script type = "text/javascript" src = "/Scratch/js/article.js" > < / script >
2011-04-20 12:29:01 +00:00
<!-- [if lt IE 9]>
< script src = "http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js" > < / script >
<![endif]-->
< title > Git for n00b< / title >
< / head >
2011-10-18 22:30:00 +00:00
< body lang = "en" class = "article" >
2011-04-20 12:29:01 +00:00
< script type = "text/javascript" > / / < ! [ C D A T A [
2011-04-20 13:56:52 +00:00
document.write('< div id = "blackpage" > < img src = "/Scratch/img/loading.gif" alt = "loading..." / > < / div > ');
2011-04-20 12:29:01 +00:00
// ]]>
< / script >
< div id = "content" >
< div id = "choix" >
< div class = "return" > < a href = "#entete" > ↓ Menu ↓ < / a > < / div >
< div id = "choixlang" >
2011-04-20 13:56:52 +00:00
< a href = "/Scratch/fr/blog/2009-11-12-Git-for-n00b/conf-et-install/" onclick = "setLanguage('fr')" > en Français< / a >
2011-04-20 12:29:01 +00:00
< / div >
2011-09-28 16:05:55 +00:00
< div class = "flush" > < / div >
2011-04-20 12:29:01 +00:00
< / div >
< div id = "titre" >
< h1 >
Git for n00b
< / h1 >
< h2 >
Configure before Use
< / h2 >
< / div >
< div class = "flush" > < / div >
2011-04-20 13:56:52 +00:00
< div id = "sousliens" > < ul > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/" > introduction < span class = "nicer" > » < / span > < / a > < / li > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/Git-pour-quoi-faire/" > Git for what? < span class = "nicer" > » < / span > < / a > < / li > < li > < span class = "active" title = "You're here." > Configure before Use < span class = "nicer" > » < / span > < / span > < / li > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure/" > The Adventure Begins < span class = "nicer" > » < / span > < / a > < / li > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/comprendre/" > Understanding < span class = "nicer" > » < / span > < / a > < / li > < li > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/commandes-avancees/" > Command List < span class = "nicer" > » < / span > < / a > < / li > < / ul > < / div >
2011-04-20 12:29:01 +00:00
< div class = "flush" > < / div >
< div id = "afterheader" >
< div class = "corps" >
< h1 class = "first" id = "before-usage-configuration" > Before usage, configuration< / h1 >
< h2 id = "install" > install< / h2 >
< p > Under Linux Ubuntu or Debian:< / p >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > $ sudo apt-get install git< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
< p > Under Mac OS X:< / p >
< ul >
< li > install < a href = "http://macports.org/install.php" > MacPorts< / a > < / li >
< li > install < a href = "http://git-scm.org" title = "Git" > Git< / a > < / li >
< / ul >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > $ sudo port selfupdate
2011-04-20 12:29:01 +00:00
$ sudo port install git-core
2012-05-02 15:43:56 +00:00
< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
< h2 id = "global-configuration" > Global configuration< / h2 >
< p > Save the following file as your < code > ~/.gitconfig< / code > .< / p >
2012-05-02 15:43:56 +00:00
< div > < div class = "codefile" > < a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/conf-et-install/code/gitconfig" > ➥ gitconfig< / a > < / div >
< pre > < code class = "zsh" > [color]
2011-04-20 12:29:01 +00:00
branch = auto
diff = auto
status = auto
[alias]
st = status
co = checkout
br = branch
lg = log --pretty=oneline --graph
logfull = log --pretty=fuller --graph --stat -p
unstage = reset HEAD
2012-05-02 15:43:56 +00:00
# there should be an article on what this command do
uncommit = !zsh -c '"if (($0)); then nb=$(( $0 - 1 )); else nb=0; fi; i=0; while ((i< =nb)); do git revert -n --no-edit HEAD~$i; ((i++)); done; git commit -m \"revert to $0 version(s) back\""'
2011-04-20 12:29:01 +00:00
undomerge = reset --hard ORIG_HEAD
2012-05-02 15:43:56 +00:00
conflict = !gitk --left-right HEAD...MERGE_HEAD
# under Mac OS X, you should use gitx instead
# conflict = !gitx --left-right HEAD...MERGE_HEAD
2011-04-20 12:29:01 +00:00
[branch]
autosetupmerge = true
2012-05-02 15:43:56 +00:00
< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
< p > You can achieve the same result using for each entry the command: < code > git config --global< / code > . Next, configure your name and your email. For example, if your name is John Doe and your email is < code > john.doe@email.com< / code > . Launch the following commands:< / p >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > $ git config --global user.name John Doe
2011-04-20 12:29:01 +00:00
$ git config --global user.email john.doe@email.com
2012-05-02 15:43:56 +00:00
< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
< p > Here it is. Base configuration is over. The file containing alias will help to type shorter commands.< / p >
< h2 id = "get-a-project" > Get a project< / h2 >
< p > If a project is already versionned with < a href = "http://git-scm.org" title = "Git" > Git< / a > you should have an < code > URL< / code > of the sources. Then use the following command:< / p >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > $ cd ~/Projets
2011-04-20 12:29:01 +00:00
$ git clone git://main.server/path/to/file
2012-05-02 15:43:56 +00:00
< / code > < / pre >
< / div >
2012-05-03 09:21:34 +00:00
< p > If there is no git server but you’ ve got an < code > ssh< / code > access. Just replace the < code > git://host< / code > by < code > ssh://user@host< / code > . In order not to type your password each time, use:< / p >
2012-05-02 15:43:56 +00:00
< div >
2011-04-20 12:29:01 +00:00
2012-05-02 15:43:56 +00:00
< pre > < code class = "zsh" > $ ssh-keygen -t rsa
< / code > < / pre >
2011-04-20 12:29:01 +00:00
2012-05-02 15:43:56 +00:00
< / div >
2011-04-20 12:29:01 +00:00
< p > Reply to question and < em > *do not enter< / em > a password. Then copy your keys to the distant server. This is not the safest way to do this. The safest being, using < code > ssh-agent< / code > .< / p >
< p > The easiest way if you have < code > ssh-copy-id< / code > :< / p >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > me@locahost$ ssh-copy-id ~/.ssh/id_rsa.pub me@main.server
< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
< p > or manually< / p >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > me@locahost$ scp ~/.ssh/id_rsa.pub me@main.server:
2011-04-20 12:29:01 +00:00
me@locahost$ ssh me@main.server
password:
2012-05-02 15:43:56 +00:00
me@main.server$ cat id_rsa.pub > > ~/.ssh/authorized_keys
2011-04-20 12:29:01 +00:00
me@main.server$ rm id_rsa.pub
me@main.server$ logout
2012-05-02 15:43:56 +00:00
< / code > < / pre >
2011-04-20 12:29:01 +00:00
2012-05-02 15:43:56 +00:00
< / div >
2012-05-03 09:21:34 +00:00
< p > Now you don’ t need to write your password to access the < code > main.server< / code > .< / p >
2011-04-20 12:29:01 +00:00
< h2 id = "creating-a-new-project" > Creating a new project< / h2 >
< p > Suppose you already have a project with files. Then it is really easy to version it.< / p >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > $ cd /path/to/project
2011-04-20 12:29:01 +00:00
$ git init
$ git add .
2012-05-02 15:43:56 +00:00
$ git commit -m "Initial commit"
< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
2012-05-03 09:21:34 +00:00
< p > Let do a small remark. If you don’ t want to < em > version< / em > every file. Typically intermediate compilation file, swap files… Then you need to exclude them. Just before launching the < code > git add .< / code > command. You need to create a < code > .gitignore< / code > file in the root directory of your project. This file will contain all exclude < em > pattern< / em > . For example:< / p >
2011-04-20 12:29:01 +00:00
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > *.o
2011-04-20 12:29:01 +00:00
*.bak
*.swp
*~
2012-05-02 15:43:56 +00:00
< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
< p > Now, if you want to create a repository on a distant server, it < em > must< / em > not be in < code > bare< / code > mode. The repository will contain only versionning informations, but not the files of the project. To achieve that:< / p >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > $ cd /path/to/local/project
2011-04-20 12:29:01 +00:00
$ git clone --bare . ssh://server/path/to/project
2012-05-02 15:43:56 +00:00
< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
< p > Others will be able to get your modifications.< / p >
2012-05-02 15:43:56 +00:00
< div >
< pre > < code class = "zsh" > git clone ssh://server/path/to/project
< / code > < / pre >
< / div >
2011-04-20 12:29:01 +00:00
< h2 id = "abstract-of-the-second-step" > Abstract of the second step< / h2 >
< p > You now have a local directory on your computer. It is versionned and you can say it is, because there is a < code > .git< / code > directory at the root (and the root only) of your project. This directory contain all necessary informations for < a href = "http://git-scm.org" title = "Git" > Git< / a > to version your project.< / p >
< p > Now you only need to know how to use it.< / p >
< / div >
2012-04-10 13:56:34 +00:00
< div id = "social" >
< div class = "left" > < a href = "https://twitter.com/share" class = "twitter-share-button" data-via = "yogsototh" > Tweet< / a >
< script > ! function ( d , s , id ) { var js , fjs = d . getElementsByTagName ( s ) [ 0 ] ; if ( ! d . getElementById ( id ) ) { js = d . createElement ( s ) ; js . id = id ; js . src = "//platform.twitter.com/widgets.js" ; fjs . parentNode . insertBefore ( js , fjs ) ; } } ( document , "script" , "twitter-wjs" ) ; < / script >
< / div >
< div class = "left" > < div class = "g-plusone" data-size = "medium" data-annotation = "inline" data-width = "106" > < / div >
< script type = "text/javascript" >
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
< / script >
< / div >
< div class = "flush" > < / div >
< / div >
2011-04-20 12:29:01 +00:00
< div id = "choixrss" >
< a id = "rss" href = "http://feeds.feedburner.com/yannespositocomen" >
Subscribe
< / a >
< / div >
< script type = "text/javascript" >
$(document).ready(function(){
$('#comment').hide();
$('#clickcomment').click(showComments);
});
function showComments() {
$('#comment').show();
$('#clickcomment').fadeOut();
}
2012-04-10 13:56:34 +00:00
document.write('< div id = "clickcomment" > Comments & Share< / div > ');
2011-04-20 12:29:01 +00:00
< / script >
< div class = "flush" > < / div >
2012-04-10 13:56:34 +00:00
2011-04-20 12:29:01 +00:00
< div class = "corps" id = "comment" >
< h2 class = "first" > comments< / h2 >
< noscript >
You must enable javascript to comment.
< / noscript >
< script type = "text/javascript" >
var idcomments_acct = 'a307f0044511ff1b5cfca573fc0a52e7';
2012-01-11 20:40:22 +00:00
var idcomments_post_id = '/Scratch/en/blog/2009-11-12-Git-for-n00b/conf-et-install/';
var idcomments_post_url = 'http://yannesposito.com/Scratch/en/blog/2009-11-12-Git-for-n00b/conf-et-install/';
2011-04-20 12:29:01 +00:00
< / script >
< span id = "IDCommentsPostTitle" style = "display:none" > < / span >
2011-04-20 13:56:52 +00:00
< script type = 'text/javascript' src = '/Scratch/js/genericCommentWrapperV2.js' > < / script >
2011-04-20 12:29:01 +00:00
< / div >
< div id = "entete" class = "corps_spaced" >
< div id = "liens" >
2011-04-20 13:56:52 +00:00
< ul > < li > < a href = "/Scratch/en/" > Home< / a > < / li >
< li > < a href = "/Scratch/en/blog/" > Blog< / a > < / li >
< li > < a href = "/Scratch/en/softwares/" > Softwares< / a > < / li >
< li > < a href = "/Scratch/en/about/" > About< / a > < / li > < / ul >
2011-04-20 12:29:01 +00:00
< / div >
< div class = "flush" > < / div >
< hr / >
< div id = "next_before_articles" >
< div id = "previous_articles" >
previous entries
< div class = "previous_article" >
2012-01-11 20:40:22 +00:00
< a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/Git-pour-quoi-faire/" > < span class = "nicer" > «< / span > Git for n00b< / a >
2011-04-20 12:29:01 +00:00
< / div >
< / div >
< div id = "next_articles" >
next entries
< div class = "next_article" >
2012-01-11 20:40:22 +00:00
< a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/c-est-parti-pour-l-aventure/" > Git for n00b < span class = "nicer" > »< / span > < / a >
2011-04-20 12:29:01 +00:00
< / div >
< div class = "next_article" >
2012-01-11 20:40:22 +00:00
< a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/comprendre/" > Git for n00b < span class = "nicer" > »< / span > < / a >
2011-04-20 12:29:01 +00:00
< / div >
< div class = "next_article" >
2012-01-11 20:40:22 +00:00
< a href = "/Scratch/en/blog/2009-11-12-Git-for-n00b/commandes-avancees/" > Git for n00b < span class = "nicer" > »< / span > < / a >
2011-04-20 12:29:01 +00:00
< / div >
< / div >
< div class = "flush" > < / div >
< / div >
< / div >
< div id = "bottom" >
2012-04-02 21:43:39 +00:00
< div >
2012-04-10 13:56:34 +00:00
< a href = "https://twitter.com/yogsototh" > Follow @yogsototh< / a >
2012-04-02 21:43:39 +00:00
< / div >
2011-04-20 12:29:01 +00:00
< div >
< a rel = "license" href = "http://creativecommons.org/licenses/by-sa/3.0/" > Copyright ©, Yann Esposito< / a >
< / div >
< div id = "lastmod" >
Created: 11/12/2009
Modified: 09/20/2010
< / div >
< div >
Entirely done with
< a href = "http://www.vim.org" > Vim< / a >
and
< a href = "http://nanoc.stoneship.org" > nanoc< / a >
< / div >
< / div >
< div class = "clear" > < / div >
< / div >
< / body >
< / html >