Skip to content

Commit fcbc712

Browse files
author
KokaKiwi
committed
Started french translation.
1 parent 046367f commit fcbc712

File tree

1 file changed

+218
-0
lines changed

1 file changed

+218
-0
lines changed

‎index.fr.html

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<title>git - petit guide - no deep shit!</title>
7+
<link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
8+
<link rel="stylesheet" href="css/normalize.css" type="text/css">
9+
<link rel="stylesheet" href="css/style.css" type="text/css">
10+
<!--<script type="text/javascript">
11+
var _gaq = _gaq || [];
12+
_gaq.push(['_setAccount', 'UA-652147-13']);
13+
_gaq.push(['_trackPageview']);
14+
15+
(function() {
16+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
17+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
18+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
19+
})();
20+
</script>-->
21+
</head>
22+
<body>
23+
<div class="scrollblock block-title">
24+
<h1>git - petit guide</h1>
25+
<p>juste un petit guide pour bien d&eacute;marrer avec git. <!-- UNTRANSLATED -->no deep shit ;)</p>
26+
<a href="https://twitter.com/share" class="twitter-share-button" data-via="rogerdudler" data-size="large" data-related="rogerdudler" data-hashtags="git">Tweet</a>
27+
<!--<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>-->
28+
<p class="meta">
29+
par <a href="http://www.rogerdudler.com">Roger Dudler</a>
30+
<br /><!-- UNTRANSLATED -->Credits to <a href="http://www.twitter.com/tfnico">@tfnico</a> et <a href="http://www.twitter.com/fhd">@fhd</a>
31+
</p>
32+
<img src="img/arrow.png" alt="" />
33+
</div>
34+
<!-- setup -->
35+
<a name="setup"></a>
36+
<div class="scrollblock block-setup">
37+
<h2>installation</h2>
38+
<p>
39+
<a href="http://code.google.com/p/git-osx-installer/downloads/list?can=3">T&eacute;l&eacute;charger git pour Mac OSX</a>
40+
</p>
41+
<p>
42+
<a href="http://code.google.com/p/msysgit/downloads/list?can=3">T&eacute;l&eacute;charger git pour Windows</a>
43+
</p>
44+
</div>
45+
<a name="create"></a>
46+
<div class="scrollblock block-create">
47+
<h2>cr&eacute;er un nouveau d&eacute;p&ocirc;t</h2>
48+
<p>
49+
cr&eacute;ez un nouveau dossier, ouvrez le et ex&eacute;cutez la commande<br />
50+
<code>git init</code><br />
51+
pour cr&eacute;er un nouveau d&eacute;p&ocirc;t.
52+
</p>
53+
</div>
54+
<a name="checkout"></a>
55+
<div class="scrollblock block-checkout">
56+
<h2>mettre &agrave; jour un d&eacute;p&ocirc;t</h2>
57+
<p>
58+
cr&eacute;ez une copie de votre d&eacute;p&ocirc;t local en ex&eacute;cutant la commande<br />
59+
<code>git clone /path/to/repository</code><br />
60+
si vous utilisez un serveur distant, cette commande sera<br />
61+
<code>git clone username@host:/path/to/repository</code>
62+
</p>
63+
</div>
64+
<a name="trees"></a>
65+
<div class="scrollblock block-trees">
66+
<h2>arbres</h2>
67+
<p>
68+
votre d&eacute;p&ocirc;t local est compos&eacute; de trois &quot;arbres&quot; g&eacute;r&eacute;s par git.
69+
le premier est votre <code>espace de travail</code> qui contient vos fichiers actuels.
70+
le second est un <code>Index</code> qui joue un r&ocirc;le d'espace de transit pour vos fichiers et
71+
enfin le <code>HEAD</code> qui pointe vers la derni&egrave;re validation que vous ayez fait.
72+
</p>
73+
<img src="img/trees.png" alt="" />
74+
</div>
75+
<a name="add"></a>
76+
<div class="scrollblock block-add">
77+
<h2>ajouter &amp; valider</h2>
78+
<p>
79+
Vous pouvez proposer un changement (l'ajouter &agrave; l'<b>Index</b>) en ex&eacute;cutant les commandes<br />
80+
<code>git add &lt;filename&gt;</code><br />
81+
<code>git add *</code><br />
82+
C'est la premi&egrave;re &eacute;tape dans un workflow git basique. Pour valider ces changements, utilisez<br />
83+
<code>git commit -m "Message de commit"</code><br />
84+
Le fichier est donc ajout&eacute; &agrave; le <b>HEAD</b>, mais pas encore dans votre d&eacute;p&ocirc;t distant.
85+
</p>
86+
</div>
87+
<a name="push"></a>
88+
<div class="scrollblock block-remote">
89+
<h2>envoyer des changements</h2>
90+
<p>
91+
Vos changements sont maintenant dans le <b>HEAD</b> de la copie de votre d&eacute;p&ocirc;t local. Pour les envoyer &agrave; votre d&eacute;p&ocirc;t distant, ex&eacute;cutez la commande<br />
92+
<code>git push origin master</code><br />
93+
Remplacez <i>master</i> par la branche dans laquelle vous souhaitez envoyer vos changements.
94+
<br /><br />
95+
Si vous n'avez pas clon&eacute; votre d&eacute;p&ocirc;t existant et voulez le connecter &agrave; votre d&eacute;p&ocirc;t sur un serveur distant, vous devez l'ajouter avec<br />
96+
<code>git remote add origin &lt;server&gt;</code><br />
97+
Maintenant, vous pouvez envoyer vos changements vers le serveur distant s&eacute;lectionn&eacute;<br />
98+
99+
</p>
100+
</div>
101+
<a name="branching"></a>
102+
<div class="scrollblock block-branching">
103+
<h2>branches</h2>
104+
<p>
105+
Les branches sont utilis&eacute;es pour d&eacute;velopper des fonctionnalit&eacute;s isol&eacute;es des autres.
106+
La branche <i>master</i> est la branche par d&eacute;faut quand vous cr&eacute;ez un d&eacute;p&ocirc;t.
107+
Utilisez les autres branches pour le d&eacute;veloppement et fusionnez ensuite &agrave; la branche principale quand vous avez fini.
108+
</p>
109+
<img src="img/branches.png" alt="" />
110+
<p>
111+
cr&eacute;er une nouvelle branche nomm&eacute;e &quot;feature_x&quot; et <!-- BAD TRANSLATE -->passer dessus pour l'utiliser<br />
112+
<code>git checkout -b feature_x</code><br />
113+
retourner sur la branche principale<br />
114+
<code>git checkout master</code><br />
115+
et supprimer la branche<br />
116+
<code>git branch -d feature_x</code><br />
117+
une branche n'est <i>pas disponible pour les autres</i> tant que vous ne l'aurez pas envoy&eacute;e vers votre d&eacute;p&ocirc;t distant<br />
118+
<code>git push origin &lt;branch&gt;</code>
119+
</p>
120+
</div>
121+
<a name="update"></a>
122+
<div class="scrollblock block-merging">
123+
<h2>update &amp; merge</h2>
124+
<p>
125+
to update your local repository to the newest commit, execute <br />
126+
<code>git pull</code><br />
127+
in your working directory to <i>fetch</i> and <i>merge</i> remote changes.<br />
128+
to merge another branch into your active branch (e.g. master), use<br />
129+
<code>git merge &lt;branch&gt;</code><br />
130+
in both cases git tries to auto-merge changes. Unfortunately, this is not always possible and results in <i>conflicts</i>.
131+
You are responsible to merge those <i>conflicts</i>
132+
manually by editing the files shown by git. After changing, you need to mark them as merged with<br />
133+
<code>git add &lt;filename&gt;</code><br />
134+
before merging changes, you can also preview them by using<br />
135+
<code>git diff &lt;source_branch&gt; &lt;target_branch&gt;</code>
136+
</p>
137+
</div>
138+
<a name="tagging"></a>
139+
<div class="scrollblock block-tagging">
140+
<h2>tagging</h2>
141+
<p>
142+
it's recommended to create tags for software releases. this is a known concept, which also exists in SVN. You can create a new tag named <i>1.0.0</i> by executing<br />
143+
<code>git tag 1.0.0 1b2e1d63ff</code><br />
144+
the <i>1b2e1d63ff</i> stands for the first 10 characters of the commit id you want to reference with your tag. You can get the commit id with <br />
145+
<code>git log</code><br />
146+
you can also use less characters of the commit id, it just has to be unique.
147+
</p>
148+
</div>
149+
<a name="checkout-replace"></a>
150+
<div class="scrollblock block-checkout-replace">
151+
<h2>replace local changes</h2>
152+
<p>
153+
In case you did something wrong (which for sure never happens ;) you can replace local changes using the command<br />
154+
<code>git checkout -- &lt;filename&gt;</code><br />
155+
this replaces the changes in your working tree with the last content in HEAD. Changes already added to the index, as well as new files, will be kept.
156+
</p>
157+
<p>
158+
If you instead want to drop all your local changes and commits, fetch the latest history from the server and point your local master branch at it like this<br />
159+
<code>git fetch origin</code><br />
160+
<code>git reset --hard origin/master</code>
161+
</p>
162+
</div>
163+
<a name="hints"></a>
164+
<div class="scrollblock block-hints">
165+
<h2>useful hints</h2>
166+
<p>
167+
built-in git GUI<br />
168+
<code>gitk</code><br />
169+
use colorful git output<br />
170+
<code>git config color.ui</code><br />
171+
show log on just one line per commit<br />
172+
<code>git config format.pretty oneline</code><br />
173+
use interactive adding<br />
174+
<code>git add -i</code>
175+
</p>
176+
</div>
177+
<a name="resources"></a>
178+
<div class="scrollblock block-resources">
179+
<h2>links & resources</h2>
180+
<h3>graphical clients</h3>
181+
<p>
182+
<ul>
183+
<li><a href="http://gitx.laullon.com/">GitX (L) (OSX, open source)</a></li>
184+
<li><a href="http://www.git-tower.com/">Tower (OSX)</a></li>
185+
<li><a href="http://www.sourcetreeapp.com/">Source Tree (OSX, free)</a></li>
186+
<li><a href="http://mac.github.com/">GitHub for Mac (OSX, GitHub only, free)</a></li>
187+
</ul>
188+
</p>
189+
<h3>guides</h3>
190+
<p>
191+
<ul>
192+
<li><a href="http://book.git-scm.com/">Git Community Book</a></li>
193+
<li><a href="http://progit.org/book/">Pro Git</a></li>
194+
<li><a href="http://think-like-a-git.net/">Think like a git</a></li>
195+
<li><a href="http://help.github.com/">GitHub Help</a></li>
196+
<li><a href="http://marklodato.github.com/visual-git-guide/index-en.html">A Visual Git Guide</a></li>
197+
</ul>
198+
</p>
199+
</div>
200+
<a name="comments"></a>
201+
<div class="scrollblock block-comments">
202+
<h2>comments</h2>
203+
<div id="disqus_thread"></div>
204+
<!--<script type="text/javascript">
205+
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
206+
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
207+
208+
/* * * DON'T EDIT BELOW THIS LINE * * */
209+
(function() {
210+
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
211+
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
212+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
213+
})();
214+
</script>
215+
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>-->
216+
</div>
217+
</body>
218+
</html>

0 commit comments

Comments
 (0)