Skip to content

Commit b234ab0

Browse files
author
jordanmccullough
committed
Merge remote-tracking branch 'origin/master' into deck-framework-update
Conflicts: _javascript/curriculum.js _layouts/curriculum.html _stylesheets/curriculum.css _stylesheets/curriculum.scss
2 parents 3fee0b5 + 52615fe commit b234ab0

File tree

11 files changed

+5796
-20
lines changed

11 files changed

+5796
-20
lines changed

‎_layouts/cheat-sheet.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: site
3+
---
4+
5+
<div class="container cheat-sheet">
6+
{{ content }}
7+
</div>

‎_stylesheets/page.css

Lines changed: 5580 additions & 1 deletion
Large diffs are not rendered by default.

‎_stylesheets/page.scss

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,3 +187,32 @@ footer {
187187
}
188188
}
189189
}
190+
191+
192+
.cheat-sheet{
193+
-webkit-column-count: 2;
194+
-moz-column-count: 2;
195+
column-count: 2;
196+
197+
-webkit-column-gap: 4em;
198+
-moz-column-gap: 4em;
199+
column-gap: 4em;
200+
201+
h1, h1+p{
202+
display: none;
203+
}
204+
205+
h2:first-of-type{
206+
margin-top: 0;
207+
}
208+
209+
h2:last-of-type{
210+
-webkit-column-span: all;
211+
-moz-column-span: all;
212+
column-span: all;
213+
214+
padding-top: 1em;
215+
margin-top: 1em;
216+
border-top: solid 1px $mono-light;
217+
}
218+
}

‎downloads/ar/github-git-cheat-sheet.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
---
2+
layout: cheat-sheet
3+
title: برشامة أوامر Git لنظام GitHub
4+
byline: أمر Git هو نظام تحكم بالنسخ الموزعة المفتوحة المصدر التي توظف أنشطة GitHub في الحواسيب الشخصية. هذه "البرشامة" تلخص تعليمات Git الأكثر استخداماً على سطر الأوامر كمرجع سري
5+
leadingpath: ../../
6+
---
7+
18
<h1 dir="rtl"> برشامة أوامر Git لنظام GitHub</h1>
29
<p dir="rtl">أمر Git هو نظام تحكم بالنسخ الموزعة المفتوحة المصدر التي توظف أنشطة GitHub في الحواسيب الشخصية. هذه "البرشامة" تلخص تعليمات Git الأكثر استخداماً على سطر الأوامر كمرجع سريع.</p>
310

@@ -226,5 +233,3 @@ temp-*
226233

227234
* [email protected]
228235
* training.github.com
229-
230-

‎downloads/es_ES/github-git-cheat-sheet.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
---
2+
layout: cheat-sheet
3+
title: Hoja de referencia para Git de Github
4+
byline: Git es el sistema de control de versiones distribuido de código abierto que facilita realizar actividades de Github en tu computadora portátil o de escritorio. Esta hoja de referencia resume las instrucciones de línea de comandos comúnmente usadas para una rápida referencia.
5+
leadingpath: ../../
6+
---
7+
18
# Hoja de referencia para Git de Github
29

310
Git es el sistema de control de versiones distribuido de código abierto que facilita realizar actividades de Github en tu computadora portátil o de escritorio. Esta hoja de referencia resume las instrucciones de línea de comandos comúnmente usadas para una rápida referencia.

‎downloads/fr/github-git-cheat-sheet.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
---
2+
layout: cheat-sheet
3+
title: Aide-mémoire GitHub Git
4+
byline: Git est le sytème de gestion de version décentralisé open source qui facilite les activités GitHub sur votre ordinateur. Cet aide-mémoire permet un accès rapide aux instructions des commandes Git les plus utilisées.
5+
leadingpath: ../../
6+
---
7+
18
# Aide-mémoire GitHub Git
29

310
Git est le sytème de gestion de version décentralisé open source qui facilite les activités GitHub sur votre ordinateur. Cet aide-mémoire permet un accès rapide aux instructions des commandes Git les plus utilisées.
@@ -119,12 +126,12 @@ Supprime le fichier du répertoire de travail et met à jour l'index
119126

120127
```$ git rm --cached [fichier]```
121128

122-
Supprime le fichier du système de suivi de version mais le préserve localement
129+
Supprime le fichier du système de suivi de version mais le préserve localement
123130

124131

125132
```$ git mv [fichier-nom] [fichier-nouveau-nom]```
126133

127-
Renomme le fichier et prépare le changement pour un commit
134+
Renomme le fichier et prépare le changement pour un commit
128135

129136
## Exclure du suivi de version
130137
Exclure des fichiers et chemins temporaires
@@ -227,7 +234,7 @@ Récupère tout l'historique du dépôt nommé et incorpore les modifications
227234
---
228235

229236
## Formations GitHub
230-
Formez-vous à l'utilisation de GitHub et Git. Contactez l'équipe de formation ou visitez notre site web pour connaître les dates de formation
237+
Formez-vous à l'utilisation de GitHub et Git. Contactez l'équipe de formation ou visitez notre site web pour connaître les dates de formation
231238
et les disponibilités pour des cours privés.
232239

233240
* [email protected]

‎downloads/github-git-cheat-sheet.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
---
2+
layout: cheat-sheet
3+
title: GitHub Git Cheat Sheet
4+
byline: Git is the open source distributed version control system that facilitates GitHub activities on your laptop or desktop. This cheat sheet summarizes commonly used Git command line instructions for quick reference.
5+
leadingpath: ../
6+
---
7+
18
# GitHub Git Cheat Sheet
29

310
Git is the open source distributed version control system that facilitates GitHub activities on your laptop or desktop. This cheat sheet summarizes commonly used Git command line instructions for quick reference.

‎downloads/ja/github-git-cheat-sheet.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
---
2+
layout: cheat-sheet
3+
title: GitHub Git チートシート
4+
byline: Gitはオープンソースとして配布されているバージョン管理システムです。Gitを使うと、あなたのノートまたはデスクトップパソコンから、GitHub上のアクティビティーを操作できます。この早見表にはコマンドラインからよく使われているGitの命令をまとめています。
5+
leadingpath: ../../
6+
---
7+
18
# GitHub Git チートシート
29

310
Gitはオープンソースとして配布されているバージョン管理システムです。Gitを使うと、あなたのノートまたはデスクトップパソコンから、GitHub上のアクティビティーを操作できます。この早見表にはコマンドラインからよく使われているGitの命令をまとめています。

‎downloads/pt/github-git-cheat-sheet.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
---
2+
layout: cheat-sheet
3+
title: GitHub Folha de dicas de Git
4+
byline: Git é um sistema de controle de versão distribuído open source que facilita ações com o GitHub em seu notebook ou desktop. Esta folha de dicas resume instruções comumente usadas via linha de comando do Git para referência rápida.
5+
leadingpath: ../../
6+
---
7+
8+
19
# GitHub Folha de dicas de Git
210

311
Git é um sistema de controle de versão distribuído open source que facilita ações com o GitHub em seu notebook ou desktop. Esta folha de dicas resume instruções comumente usadas via linha de comando do Git para referência rápida.

‎downloads/subversion-migration.md

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
---
2+
layout: cheat-sheet
3+
title: Subversion to Git migration
4+
byline: From understanding the vocabularies of Subversion and Git technologies to migrating a project to GitHub, this cheat sheet can help.
5+
---
6+
7+
# Subversion to Git migration
8+
9+
From understanding the vocabularies of Subversion and Git technologies to migrating a project to GitHub, this cheat sheet can help.
10+
11+
12+
## Vocabulary
13+
14+
| Git command | SVN | SVN equivalent | Git Behavior |
15+
|---|---|---|---|
16+
| `status` | ✓ | status | Report the state of working tree |
17+
| `add` | — | add | Required for each path before making a commit |
18+
| `commit` | — | commit | Store prepared changes in local revision history |
19+
| `rm` | ✓ | `rm`, `delete` | Prepare paths for deletion in next commit |
20+
| `mv` | ✓ | `move` | Prepare relocated content for next commit |
21+
| `branch` | — | | Create local context for commits |
22+
| `checkout` | — | | Switch branches, or rewrite working tree from commit |
23+
| `merge` | ✓ | | Join branch histories and changes to working tree |
24+
| `log` | — | | No network required |
25+
| `clone` | ✗ | `checkout` | Acquire the entire history of a project locally for the first time |
26+
| `push` | ✗ | `commit` | Upload commit history to GitHub/centralized Git host |
27+
| `pull` | ✗ | | Download and integrate GitHub repository history with local one |
28+
| `fetch` | ✗ | | Download GitHub repository history with no other action |
29+
30+
**Key:** ✓ yes, ✗ no, — partial
31+
32+
## Leveraging Git's support of SVN
33+
During a VCS change, there may be a need to begin using Git locally while the hosted repositories remain under Subversion control. The `git svn` command and sub-commends provide the ability to interact with Subversion's repositories while using all the benefits of Git on the command line or with graphical clients.
34+
35+
Acquire an SVN repository, with a resulting Git repository locally:
36+
37+
`git svn clone [svn-repo-url]`
38+
39+
**Note:** Keep in mind the *layout* of the SVN repository and whether this follows the standard pattern or not. If the Subversion repository follows the traditional `trunk`, `branches`, and `tags` pattern, supply the `--std-layout` option. When the Subversion repository is non-standard or organized in a more custom structure, the following options switches should be specified during the clone:
40+
41+
* `-T [trunk]` for alternate main source convention
42+
* `-b [branches]` for alternate branch location
43+
* `-t [tags]` for alternate tag structure location
44+
45+
Once the clone operation completes, you can proceed with any standard Git interactions, commands and processes.
46+
47+
## Synchronizing with SVN repository
48+
49+
Once local history within a `git svn clone` repository has occurred, the commits must be published to the Subversion repository.
50+
51+
`git svn dcommit`
52+
53+
If the Subversion repository has commits not yet on the local Git-equivalent, a `rebase` must first be performed.
54+
55+
`git svn rebase`
56+
57+
Keep in mind this rewrites local Git history and your Git commit refs will be different than before the command is run.
58+
59+
## Subversion tooling bridge via GitHub
60+
61+
For users familiar with Subversion toolsets and clients, [GitHub fully supports and bridges communications to the central repository](https://help.github.com/articles/support-for-subversion-clients/). All Subversion commits directed at a GitHub hosted repository will automatically be converted to Git commits.
62+
63+
* [Topics about branch strategies with SVN](https://github.com/blog/1178-collaborating-on-github-with-subversion)
64+
* Patterns for updating `trunk` or GitHub default branch equivalent
65+
66+
67+
## Migrating
68+
69+
The use of `git svn` should be a temporary bridge and complete migration to Git repositories for both local and upstream destinations is optimal.
70+
71+
The most lightweight approach is by utilizing `git svn` as a one-time conversion from Subversion to Git repository. To migrate a Subversion repository, several aspects must be ensured:
72+
73+
* Subversion commits cease prior to initiating the process
74+
* One machine serves as intermediary during conversion
75+
* GitHub "upstream" repository intialized and ready to receive history, branches, tags
76+
77+
### Git-SVN conversion method
78+
* Create email/username mapping file
79+
* Begin `git svn clone`
80+
* Add `git remote add origin [GitHub-URL]`
81+
82+
Run each `ref` publish separately:
83+
84+
* Run `git push --all origin`
85+
* Run `git push --tags origin`
86+
87+
Or upload all `ref`s (branches, tags,) to upstream:
88+
89+
* `git push --mirror origin`
90+
91+
### SVN2Git method
92+
93+
* Install Ruby Gem [SVN2Git](https://github.com/nirvdrum/svn2git)
94+
* Identify the projects in the Subversion repository
95+
* Run `svn list [svn-repo-url]`
96+
* Start `svn2git [repo-root|repo-root/project]`
97+
98+
Considerations on migration:
99+
100+
* Convert "flat" history across all projects
101+
* Utilize Git `filter-branch --subdirectory-filter`
102+
* Migrate on a project-by-project basis
103+
* Use `--trunk`, `--nobranches`, `--notags` or `--rootistrunk` for non-standard layouts
104+
* Limit history from starting point ``--revision <<starting_rev>>``, or range `--revision <<start:end>>`
105+
106+
https://github.com/nirvdrum/svn2git
107+
108+
### GitHub importer (Porter) method
109+
* [Read the import tool documentation](https://help.github.com/articles/importing-from-other-version-control-systems-to-github/)
110+
* Expose the Subversion repository publicly
111+
* [Visit the GitHub import tool page](https://porter.github.com/new)
112+
* Point the import tool at your Subversion, TFS, or Mercurial repository
113+
* Create the username mappings
114+
* Wait for the tool to work in the background and complete the conversion

0 commit comments

Comments
 (0)