Compare commits

...

3 Commits

Author SHA1 Message Date
Aaron
95ee80911f
Merge 8350b334be into 0cbd69c22f 2024-11-23 20:13:14 +05:30
Boris Verkhovskiy
0cbd69c22f
[git] update links (#5185)
All checks were successful
Trigger site build / deploy (push) Has been skipped
CI / lint (push) Successful in 16s
2024-11-23 04:28:10 -07:00
aaron
8350b334be [git/tr] Fixes a confusion between regex and glob 2024-11-03 10:11:40 +01:00
11 changed files with 123 additions and 198 deletions

View File

@ -26,7 +26,7 @@ Eine Versionsverwaltung erfasst die Änderungen einer Datei oder eines Verzeichn
* Verteilte Versionsverwaltung konzentriert sich auf das Teilen der Änderungen. Jede Änderung hat eine eindeutige ID. * Verteilte Versionsverwaltung konzentriert sich auf das Teilen der Änderungen. Jede Änderung hat eine eindeutige ID.
* Verteilte Systeme haben keine vorbestimmte Struktur. Ein SVN-ähnliches, zentrales System wäre mit Git ebenso umsetzbar. * Verteilte Systeme haben keine vorbestimmte Struktur. Ein SVN-ähnliches, zentrales System wäre mit Git ebenso umsetzbar.
[Weiterführende Informationen](http://git-scm.com/book/en/Getting-Started-About-Version-Control) [Weiterführende Informationen](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
### Warum Git? ### Warum Git?
@ -50,7 +50,7 @@ Ein Repository besteht in Git aus dem .git-Verzeichnis und dem Arbeitsverzeichni
### .git-Verzeichnis (Teil des Repositorys) ### .git-Verzeichnis (Teil des Repositorys)
Das .git-Verzeichnis enthält alle Einstellungen, Logs, Branches, den HEAD und mehr. Das .git-Verzeichnis enthält alle Einstellungen, Logs, Branches, den HEAD und mehr.
[Ausführliche Übersicht](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Ausführliche Übersicht](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### Arbeitsverzeichnis (Teil des Repositorys) ### Arbeitsverzeichnis (Teil des Repositorys)
@ -74,12 +74,6 @@ HEAD ist ein Pointer auf den aktuellen Branch. Ein Repository hat nur einen *akt
Ein *head* ist ein Pointer, der auf einen beliebigen Commit zeigt. Ein Repository kann eine beliebige Zahl von *heads* enthalten. Ein *head* ist ein Pointer, der auf einen beliebigen Commit zeigt. Ein Repository kann eine beliebige Zahl von *heads* enthalten.
### Konzeptionelle Hintergründe
* [Git For Computer Scientists](http://eagain.net/articles/git-for-computer-scientists/)
* [Git For Designers](http://hoth.entp.com/output/git_for_designers.html)
## Befehle ## Befehle
@ -104,7 +98,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
$ git config --global user.name "My Name" $ git config --global user.name "My Name"
``` ```
[Mehr über git config](http://git-scm.com/docs/git-config) [Mehr über git config](https://git-scm.com/docs/git-config)
### help ### help
@ -255,7 +249,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
``` ```
Google ist dein Freund; für mehr Beispiele: Google ist dein Freund; für mehr Beispiele:
[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -338,7 +332,7 @@ Nimm alle Änderungen, die in einem Branch durch Commits vorgenommen wurden, und
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Weiterführende Informationen](http://git-scm.com/book/en/Git-Branching-Rebasing) [Weiterführende Informationen](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
### reset (mit Vorsicht einsetzen) ### reset (mit Vorsicht einsetzen)
@ -375,14 +369,12 @@ $ git rm /pather/to/the/file/HelloWorld.c
## Weiterführende Informationen ## Weiterführende Informationen
* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1) * [git-scm - Video Tutorials](https://git-scm.com/videos)
* [git-scm - Video Tutorials](http://git-scm.com/videos) * [git-scm - Documentation](https://git-scm.com/docs)
* [git-scm - Documentation](http://git-scm.com/docs)
* [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/) * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf) * [gitflow - Ein Modell um mit Branches zu arbeiten](https://nvie.com/posts/a-successful-git-branching-model/)
* [gitflow - Ein Modell um mit Branches zu arbeiten](http://nvie.com/posts/a-successful-git-branching-model/) * [Git For Computer Scientists](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -31,7 +31,7 @@ uno o varios archivos, a lo largo del tiempo.
+ El versionamiento distribuido no tiene una estructura definida, incluso se + El versionamiento distribuido no tiene una estructura definida, incluso se
puede mantener el estilo de los repositorios SVN con git. puede mantener el estilo de los repositorios SVN con git.
[Información adicional](http://git-scm.com/book/es/Empezando-Acerca-del-control-de-versiones) [Información adicional](https://git-scm.com/book/es/v2/Inicio---Sobre-el-Control-de-Versiones-Acerca-del-Control-de-Versiones)
### ¿Por qué usar Git? ### ¿Por qué usar Git?
@ -58,7 +58,7 @@ Un repositorio esta compuesto por la carpeta .git y un "árbol de trabajo".
El directorio .git contiene todas las configuraciones, registros, branches, HEAD El directorio .git contiene todas las configuraciones, registros, branches, HEAD
y mas. y mas.
[Lista detallada.](http://es.gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Lista detallada.](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### Directorio de trabajo (componentes del repositorio) ### Directorio de trabajo (componentes del repositorio)
@ -91,15 +91,8 @@ repositorio solo puede tener un HEAD activo. En cambio "head", es un apuntador a
cualquier commit realizado, un repositorio puede tener cualquier número de cualquier commit realizado, un repositorio puede tener cualquier número de
"heads". "heads".
### conceptos - recursos.
* [Git para informáticos](http://eagain.net/articles/git-for-computer-scientists/)
* [Git para diseñadores](http://hoth.entp.com/output/git_for_designers.html)
## Comandos. ## Comandos.
### init ### init
Crear un repositorio de git vacio. Las configuraciones, información almacenada y Crear un repositorio de git vacio. Las configuraciones, información almacenada y
@ -123,7 +116,7 @@ $ git config --global user.email "corre@gmail.com"
$ git config --global user.name "nombre" $ git config --global user.name "nombre"
``` ```
[Más sobre git config.](http://git-scm.com/book/es/Personalizando-Git-Configuración-de-Git) [Más sobre git config.](https://git-scm.com/book/es/v2/Personalizaci%c3%b3n-de-Git-Configuraci%c3%b3n-de-Git)
### help ### help
@ -275,7 +268,7 @@ $ git grep -e 'nombreArreglo' --and \( -e agregar -e remover \)
Más ejemplos: Más ejemplos:
- [Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) - [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -354,7 +347,7 @@ de otra rama. *No reescribe los commits que se han empujado antes a un repositor
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Información adicional.](http://git-scm.com/book/es/Ramificaciones-en-Git-Procedimientos-básicos-para-ramificar-y-fusionar) [Información adicional.](https://git-scm.com/book/es/v2/Ramificaciones-en-Git-Reorganizar-el-Trabajo-Realizado)
### reset (precaución) ### reset (precaución)
@ -396,22 +389,18 @@ $ git rm /directorio/del/archivo/FooBar.c
## Información Adicional ## Información Adicional
* [tryGit - Una forma entretenida y rapida de aprender Git.](http://try.github.io/levels/1/challenges/1)
* [Udemy tutorial de Git: Una guía completa](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/) * [Udemy tutorial de Git: Una guía completa](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
* [Inmersión Git - Una visita guiada caminando a través de los fundamentos de git](http://gitimmersion.com/) * [Inmersión Git - Una visita guiada caminando a través de los fundamentos de git](https://gitimmersion.com/)
* [git-scm - Video-tutoriales](http://git-scm.com/videos) * [git-scm - Video-tutoriales](https://git-scm.com/videos)
* [git-scm - Documentacion](http://git-scm.com/book/es)
* [Atlassian Git - Tutoriales y Flujos de trabajo](https://www.atlassian.com/git/) * [Atlassian Git - Tutoriales y Flujos de trabajo](https://www.atlassian.com/git/)
* [SalesForce Chuleta](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf) * [git - la guía sencilla](https://rogerdudler.github.io/git-guide/index.es.html)
* [Git - La guía simple](http://rogerdudler.github.io/git-guide/index.html) * [Pro Git](https://git-scm.com/book/es/v2)
* [Pro Git](http://www.git-scm.com/book/en/v2) * [Una introducción a Git y GitHub para principiantes (Tutorial)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
* [Una introducción a Git y GitHub para principiantes (Tutorial)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners) * [Git para informáticos](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -35,7 +35,7 @@ Chaque changement a un identifiant unique.
* Les systèmes distribués n'ont pas de structure définie. Vous pouvez aisément * Les systèmes distribués n'ont pas de structure définie. Vous pouvez aisément
avoir un système centralisé de type SVN, avec Git. avoir un système centralisé de type SVN, avec Git.
[Informations additionnelles](http://git-scm.com/book/fr/v1/D%C3%A9marrage-rapide-%C3%80-propos-de-la-gestion-de-version) [Informations additionnelles](https://git-scm.com/book/fr/v2/D%C3%A9marrage-rapide-%C3%80-propos-de-la-gestion-de-version)
### Pourquoi utiliser Git ? ### Pourquoi utiliser Git ?
@ -63,7 +63,7 @@ Un dépôt Git comprend un répertoire .git et "l'arbre de travail" (working tre
Le répertoire .git contient toutes les configurations, logs (journaux), Le répertoire .git contient toutes les configurations, logs (journaux),
branches, HEAD et plus. branches, HEAD et plus.
[Liste détaillée (EN)](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Liste détaillée (EN)](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### Arbre de travail (composant du dépôt) ### Arbre de travail (composant du dépôt)
@ -110,12 +110,6 @@ encore été rajouté à l'ensemble des fichiers Git
* Validé ("committed") - Les fichiers ont été validés dans l'ensemble de * Validé ("committed") - Les fichiers ont été validés dans l'ensemble de
fichiers fichiers
### Ressources conceptuelles
* [Git pour les informaticiens (EN)](http://eagain.net/articles/git-for-computer-scientists/)
* [Git pour les designers (EN)](http://hoth.entp.com/output/git_for_designers.html)
## Commandes ## Commandes
@ -141,7 +135,7 @@ $ git config --global user.email "monEmail@foo.com"
$ git config --global user.name "Mon nom" $ git config --global user.name "Mon nom"
``` ```
[Apprenez-en plus à propos de git config.](https://git-scm.com/book/fr/v1/Personnalisation-de-Git-Configuration-de-Git) [Apprenez-en plus à propos de git config.](https://git-scm.com/book/fr/v2/Personnalisation-de-Git-Configuration-de-Git)
### help ### help
@ -355,7 +349,7 @@ $ git grep -e 'nomDeTableau' --and \( -e rajouter -e enlever \)
``` ```
Google est votre ami; pour plus d'exemples : Google est votre ami; pour plus d'exemples :
[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -507,7 +501,7 @@ $ git stash pop
Vous êtes maintenant prêt à retourner sur vos tâches de travail ! Vous êtes maintenant prêt à retourner sur vos tâches de travail !
[Lecture additionelle.](https://git-scm.com/book/fr/v1/Utilitaires-Git-Le-remisage) [Lecture additionelle.](https://git-scm.com/book/fr/v2/Utilitaires-Git-Remisage-et-nettoyage)
### rebase (attention) ### rebase (attention)
@ -521,7 +515,7 @@ ré-applique sur une autre branche.
$ git rebase master brancheExperience $ git rebase master brancheExperience
``` ```
[Lecture additionelle.](https://git-scm.com/book/fr/v1/Les-branches-avec-Git-Rebaser) [Lecture additionelle.](https://git-scm.com/book/fr/v2/Les-branches-avec-Git-Rebaser-Rebasing)
### reset (attention) ### reset (attention)
@ -564,20 +558,18 @@ $ git rm /chemin/vers/le/fichier/HelloWorld.c
## Informations complémentaires ## Informations complémentaires
* [tryGit - A fun interactive way to learn Git (EN)](http://try.github.io/levels/1/challenges/1)
* [Udemy Git Tutorial: A Comprehensive Guide (EN)](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/) * [Udemy Git Tutorial: A Comprehensive Guide (EN)](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
* [git-scm - Tutoriaux vidéos](http://git-scm.com/videos) * [git-scm - Tutoriaux vidéos](https://git-scm.com/videos)
* [git-scm - Documentation](http://git-scm.com/docs) * [git-scm - Documentation](https://git-scm.com/docs)
* [Atlassian Git - Tutoriaux et Workflows](https://www.atlassian.com/git/) * [Atlassian Git - Tutoriaux et Workflows](https://www.atlassian.com/git/)
* [SalesForce Cheat Sheet (EN)](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf) * [git - petit guide](https://rogerdudler.github.io/git-guide/index.fr.html)
* [Git - the simple guide (EN)](http://rogerdudler.github.io/git-guide/index.html) * [Livre Pro Git](https://git-scm.com/book/fr/v2)
* [Livre Pro Git](http://www.git-scm.com/book/fr/v1) * [Une introduction à Git et GitHub pour les débutants (tutoriel) (EN)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
* [Une introduction à Git et GitHub pour les débutants (tutoriel) (EN)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners) * [Git pour les informaticiens (EN)](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -33,7 +33,7 @@ unique id.
* Distributed systems have no defined structure. You could easily have a SVN * Distributed systems have no defined structure. You could easily have a SVN
style, centralized system, with git. style, centralized system, with git.
[Additional Information](http://git-scm.com/book/en/Getting-Started-About-Version-Control) [Additional Information](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
### Why Use Git? ### Why Use Git?
@ -59,7 +59,7 @@ A git repository is comprised of the .git directory & working tree.
The .git directory contains all the configurations, logs, branches, HEAD, and The .git directory contains all the configurations, logs, branches, HEAD, and
more. more.
[Detailed List.](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Detailed List.](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### Working Tree (component of repository) ### Working Tree (component of repository)
@ -102,11 +102,6 @@ to Git Database yet
* Staged - Marks a modified file to go into your next commit snapshot * Staged - Marks a modified file to go into your next commit snapshot
* Committed - Files have been committed to the Git Database * Committed - Files have been committed to the Git Database
### Conceptual Resources
* [Git For Computer Scientists](http://eagain.net/articles/git-for-computer-scientists/)
* [Git For Designers](http://hoth.entp.com/output/git_for_designers.html)
## Commands ## Commands
### init ### init
@ -132,7 +127,7 @@ $ git config --global user.email
$ git config --global user.name $ git config --global user.name
``` ```
[Learn More About git config.](http://git-scm.com/docs/git-config) [Learn More About git config.](https://git-scm.com/docs/git-config)
### help ### help
@ -345,7 +340,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
``` ```
Google is your friend; for more examples Google is your friend; for more examples
[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -495,7 +490,7 @@ $ git stash pop
Now you're ready to get back to work on your stuff! Now you're ready to get back to work on your stuff!
[Additional Reading.](http://git-scm.com/book/en/v1/Git-Tools-Stashing) [Additional Reading.](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
### rebase (caution) ### rebase (caution)
@ -509,7 +504,7 @@ another branch.
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Additional Reading.](http://git-scm.com/book/en/Git-Branching-Rebasing) [Additional Reading.](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
### reset (caution) ### reset (caution)
@ -600,26 +595,26 @@ b88c6a1b (Google Python team 2019-12-30 13:45:23 -0800 14)
## Further Information ## Further Information
* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1) * [Learn Git Branching - the most visual and interactive way to learn Git on the web](https://learngitbranching.js.org/)
* [Learn Git Branching - the most visual and interactive way to learn Git on the web](http://learngitbranching.js.org/)
* [Udemy Git Tutorial: A Comprehensive Guide](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/) * [Udemy Git Tutorial: A Comprehensive Guide](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
* [Git Immersion - A Guided tour that walks through the fundamentals of git](http://gitimmersion.com/) * [Git Immersion - A Guided tour that walks through the fundamentals of git](https://gitimmersion.com/)
* [git-scm - Video Tutorials](http://git-scm.com/videos) * [git-scm - Video Tutorials](https://git-scm.com/videos)
* [git-scm - Documentation](http://git-scm.com/docs) * [git-scm - Documentation](https://git-scm.com/docs)
* [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/) * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
* [SalesForce Cheat Sheet](http://res.cloudinary.com/hy4kyit2a/image/upload/SF_git_cheatsheet.pdf) * [SalesForce Cheat Sheet](https://res.cloudinary.com/hy4kyit2a/image/upload/SF_git_cheatsheet.pdf)
* [Git - the simple guide](http://rogerdudler.github.io/git-guide/index.html) * [git - the simple guide](https://rogerdudler.github.io/git-guide/index.html)
* [Pro Git](http://www.git-scm.com/book/en/v2) * [Pro Git](https://git-scm.com/book/en/v2)
* [An introduction to Git and GitHub for Beginners (Tutorial)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners) * [An introduction to Git and GitHub for Beginners (Tutorial)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
* [The New Boston tutorial to Git covering basic commands and workflow](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGAKWClAD_iKpNC0bGHxGhcx) * [The New Boston tutorial to Git covering basic commands and workflow](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGAKWClAD_iKpNC0bGHxGhcx)
* [Git For Computer Scientists](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -36,7 +36,7 @@ registra le modifiche apportate a uno o più file nel tempo.
* I sistemi distribuiti non hanno una struttura definita. Si potrebbe creare * I sistemi distribuiti non hanno una struttura definita. Si potrebbe creare
ad esempio un sistema centralizzato simile a SVN utilizzando Git. ad esempio un sistema centralizzato simile a SVN utilizzando Git.
[Ulteriori informazioni](http://git-scm.com/book/it/v1/Per-Iniziare-Il-Controllo-di-Versione) [Ulteriori informazioni](https://git-scm.com/book/it/v2/Per-Iniziare-Il-Controllo-di-Versione)
### Perchè usare Git? ### Perchè usare Git?
@ -60,7 +60,7 @@ Un repository comprende la cartella .git e il working tree.
### Cartella .git (componente del repository) ### Cartella .git (componente del repository)
La cartella .git contiene tutte le configurazioni, i log, i rami e altro. La cartella .git contiene tutte le configurazioni, i log, i rami e altro.
[Lista dettagliata](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Lista dettagliata](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### Working Tree (componente del repository) ### Working Tree (componente del repository)
@ -128,7 +128,7 @@ $ git config --global user.email "email@example.com"
$ git config --global user.name "Nome utente" $ git config --global user.name "Nome utente"
``` ```
[Ulteriori informazioni su git config](http://git-scm.com/docs/git-config) [Ulteriori informazioni su git config](https://git-scm.com/docs/git-config)
### help ### help
@ -456,7 +456,7 @@ Applica le modifiche effettuate su un branch su un altro branch.
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Ulteriori informazioni](https://git-scm.com/book/it/v1/Diramazioni-in-Git-Rifondazione) [Ulteriori informazioni](https://git-scm.com/book/it/v2/Git-Branching-Rebasing)
### reset (attenzione) ### reset (attenzione)

View File

@ -36,7 +36,7 @@ alteração é associada a um *id* único.
* Sistemas distribuídos não têm estrutura definida. É possivel ter um sistema * Sistemas distribuídos não têm estrutura definida. É possivel ter um sistema
centralizado ao estilo SVN usando git. centralizado ao estilo SVN usando git.
[Informação adicional (EN)](http://git-scm.com/book/en/Getting-Started-About-Version-Control) [Informação adicional (EN)](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
### Por que usar git? ### Por que usar git?
@ -64,7 +64,7 @@ Um repositório git é constituído pelo diretório .git e a *working tree*
O repositório .git contém todas as configurações, *logs*, *branches*, O repositório .git contém todas as configurações, *logs*, *branches*,
referências e outros. referências e outros.
[Lista detalhada (EN)](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Lista detalhada (EN)](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### *Working Tree* (componente do repositório) ### *Working Tree* (componente do repositório)
@ -111,11 +111,6 @@ próximo commit
* Consolidado (Committed): As mudanças foram registradas na base de dados do * Consolidado (Committed): As mudanças foram registradas na base de dados do
Git Git
### Recursos conceituais (EN)
* [Git para Cientistas de Computação](http://eagain.net/articles/git-for-computer-scientists/)
* [Git para Designers](http://hoth.entp.com/output/git_for_designers.html)
## Comandos ## Comandos
### *init* ### *init*
@ -141,7 +136,7 @@ $ git config --global user.email
$ git config --global user.name $ git config --global user.name
``` ```
[Aprenda mais sobre git config. (EN)](http://git-scm.com/docs/git-config) [Aprenda mais sobre git config. (EN)](https://git-scm.com/docs/git-config)
### help ### help
@ -363,7 +358,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
``` ```
O Google é seu amigo; para mais exemplos: O Google é seu amigo; para mais exemplos:
[Git Grep Ninja (EN)](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja (EN)](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -520,7 +515,7 @@ $ git stash pop
Agora podemos voltar a trabalhar no que havíamos deixado de lado! Agora podemos voltar a trabalhar no que havíamos deixado de lado!
[Additional Reading.](http://git-scm.com/book/en/v1/Git-Tools-Stashing) [Additional Reading.](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
### rebase (cautela!) ### rebase (cautela!)
@ -535,7 +530,7 @@ público*
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Leitura adicional (EN).](http://git-scm.com/book/en/Git-Branching-Rebasing) [Leitura adicional (EN).](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
### reset (cuidado!) ### reset (cuidado!)
@ -619,26 +614,26 @@ $ git rm /caminho/para/o/arquivo/OlaMundo.c
## Leitura complementar ## Leitura complementar
* [Configurar o Git (GitHub Docs)](https://docs.github.com/pt/get-started/quickstart/set-up-git) * [Configurar o Git (GitHub Docs)](https://docs.github.com/pt/get-started/getting-started-with-git/set-up-git)
* [Learn Git Branching - the most visual and interactive way to learn Git on the web](http://learngitbranching.js.org/) * [Learn Git Branching - the most visual and interactive way to learn Git on the web](https://learngitbranching.js.org/)
* [Udemy Git Tutorial: A Comprehensive Guide](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/) * [Udemy Git Tutorial: A Comprehensive Guide](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
* [Git Immersion - A Guided tour that walks through the fundamentals of git](http://gitimmersion.com/) * [Git Immersion - A Guided tour that walks through the fundamentals of git](https://gitimmersion.com/)
* [git-scm - Video Tutorials](http://git-scm.com/videos) * [git-scm - Video Tutorials](https://git-scm.com/videos)
* [git-scm - Documentation](http://git-scm.com/docs) * [git-scm - Documentation](https://git-scm.com/docs)
* [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/) * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf) * [git - guia prático](https://rogerdudler.github.io/git-guide/index.pt_BR.html)
* [Git - the simple guide](http://rogerdudler.github.io/git-guide/index.html) * [Pro Git (em Português)](https://git-scm.com/book/pt-br/v2)
* [Pro Git (em Português)](https://www.git-scm.com/book/pt-br/v2) * [An introduction to Git and GitHub for Beginners (Tutorial)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
* [An introduction to Git and GitHub for Beginners (Tutorial)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
* [The New Boston tutorial to Git covering basic commands and workflow](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGAKWClAD_iKpNC0bGHxGhcx) * [The New Boston tutorial to Git covering basic commands and workflow](https://www.youtube.com/playlist?list=PL6gx4Cwl9DGAKWClAD_iKpNC0bGHxGhcx)
* [Git para Cientistas de Computação](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -31,7 +31,7 @@ alteração é associada a um *id* único.
* Sistemas distribuidos não têm estrutura definida. É possivel ter um sistema * Sistemas distribuidos não têm estrutura definida. É possivel ter um sistema
centralizado ao estilo SVN usando git. centralizado ao estilo SVN usando git.
[Informação adicional (EN)](http://git-scm.com/book/en/Getting-Started-About-Version-Control) [Informação adicional (EN)](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
### Porquê usar git? ### Porquê usar git?
@ -59,7 +59,7 @@ Um repositório git é constituido pelo directório .git e a *working tree*
O repositório .git contém todas as configurações, *logs*, *branches*, O repositório .git contém todas as configurações, *logs*, *branches*,
referências e outros. referências e outros.
[Lista detalhada (EN)](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Lista detalhada (EN)](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### *Working Tree* (componente do repositório) ### *Working Tree* (componente do repositório)
@ -92,11 +92,6 @@ uma *HEAD* activa.
*head* é uma referência que aponta para qualquer *commit*. Um repositório pode *head* é uma referência que aponta para qualquer *commit*. Um repositório pode
ter um número indefinido de *heads* ter um número indefinido de *heads*
### Recursos conceptuais (EN)
* [Git para Cientistas de Computação](http://eagain.net/articles/git-for-computer-scientists/)
* [Git para Designers](http://hoth.entp.com/output/git_for_designers.html)
## Comandos ## Comandos
### *init* ### *init*
@ -122,7 +117,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
$ git config --global user.name "My Name" $ git config --global user.name "My Name"
``` ```
[Aprenda mais sobre git config. (EN)](http://git-scm.com/docs/git-config) [Aprenda mais sobre git config. (EN)](https://git-scm.com/docs/git-config)
### help ### help
@ -274,7 +269,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
``` ```
Google é teu amigo; para mais exemplos: Google é teu amigo; para mais exemplos:
[Git Grep Ninja (EN)](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja (EN)](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -361,7 +356,7 @@ público*
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Additional Reading (EN).](http://git-scm.com/book/en/Git-Branching-Rebasing) [Additional Reading (EN).](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
### reset (cautela!) ### reset (cautela!)
@ -402,12 +397,10 @@ $ git rm /pather/to/the/file/HelloWorld.c
## Informação complementar (EN) ## Informação complementar (EN)
* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1) * [git-scm - Video Tutorials](https://git-scm.com/videos)
* [git-scm - Video Tutorials](http://git-scm.com/videos) * [git-scm - Documentation](https://git-scm.com/docs)
* [git-scm - Documentation](http://git-scm.com/docs)
* [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/) * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf) * [Git para Cientistas de Computação](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -29,7 +29,7 @@ Riadenie revízií je systém, ktorý postupom času zaznamenáva zmeny súboru
* Distribuované riadenie revízií sa zameriava na zdieľanie zmien. Kaťdá zmena má jedinečný identifikátor (id). * Distribuované riadenie revízií sa zameriava na zdieľanie zmien. Kaťdá zmena má jedinečný identifikátor (id).
* Distribuované systémy nemajú definovanú štruktúru. S gitom môžeš mať centralizovaný systém v subversion (SVN) štýle. * Distribuované systémy nemajú definovanú štruktúru. S gitom môžeš mať centralizovaný systém v subversion (SVN) štýle.
[Ďalšie informácie](http://git-scm.com/book/en/Getting-Started-About-Version-Control) [Ďalšie informácie](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
### Prečo Používať Git? ### Prečo Používať Git?
@ -52,7 +52,7 @@ Git repozitár sa skladá z .git adresára a pracovného stromu
### .git Adresár (časť repozitára) ### .git Adresár (časť repozitára)
.git adresár obsahuje všetky konfigurácie, logy, vetvy, odkaz na aktuálnu vetvu (HEAD) a ostatné. .git adresár obsahuje všetky konfigurácie, logy, vetvy, odkaz na aktuálnu vetvu (HEAD) a ostatné.
[Detailný zoznam.](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Detailný zoznam.](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### Pracovný Strom (Working Tree - časť repozitára) ### Pracovný Strom (Working Tree - časť repozitára)
@ -84,12 +84,6 @@ head je ukazateľ, ktorý môže ukazovať na akýkoľvek commit. Repozitár mô
* Staged - Zmenený súbor, ktorý pôjde do najbližšieho commit snímku. * Staged - Zmenený súbor, ktorý pôjde do najbližšieho commit snímku.
* Committed - Súbory boli commitnuté do Git Databázy. * Committed - Súbory boli commitnuté do Git Databázy.
### Koncepčné zdroje
* [Git Pre Informatikov](http://eagain.net/articles/git-for-computer-scientists/)
* [Git Pre Designerov](http://hoth.entp.com/output/git_for_designers.html)
## Príkazy ## Príkazy
@ -112,7 +106,7 @@ $ git config --global user.email "MôjEmail@Zoho.com"
$ git config --global user.name "Moje Meno " $ git config --global user.name "Moje Meno "
``` ```
[Prečítaj si viac o git configu.](http://git-scm.com/docs/git-config) [Prečítaj si viac o git configu.](https://git-scm.com/docs/git-config)
### pomoc ### pomoc
@ -302,7 +296,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
``` ```
Google je tvoj kamarát; pre viac príkladov skoč na Google je tvoj kamarát; pre viac príkladov skoč na
[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -444,7 +438,7 @@ $ git stash pop
Hotovo, môžeš pokračovať v práci! Hotovo, môžeš pokračovať v práci!
[Čítaj viac.](http://git-scm.com/book/en/v1/Git-Tools-Stashing) [Čítaj viac.](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
### rebase (pozor) ### rebase (pozor)
@ -457,7 +451,7 @@ Zober všetky zmeny commitnuté do vetvy a aplikuj ich na inú vetvu.
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Čítaj viac.](http://git-scm.com/book/en/Git-Branching-Rebasing) [Čítaj viac.](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
### reset (pozor) ### reset (pozor)
@ -503,22 +497,20 @@ $ git rm /pather/to/the/file/HelloWorld.c
## Ďalšie informácie ## Ďalšie informácie
* [tryGit - Zábavný interaktívny spôsob, ako sa naučiť Git.](http://try.github.io/levels/1/challenges/1)
* [Udemy Git Tutoriál: Kompletný návod](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/) * [Udemy Git Tutoriál: Kompletný návod](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
* [Git Immersion - Návod, ktorý Ťa prevedie základmi Gitu](http://gitimmersion.com/) * [Git Immersion - Návod, ktorý Ťa prevedie základmi Gitu](https://gitimmersion.com/)
* [git-scm - Video Tutoriály](http://git-scm.com/videos) * [git-scm - Video Tutoriály](https://git-scm.com/videos)
* [git-scm - Dokumentácia](http://git-scm.com/docs) * [git-scm - Dokumentácia](https://git-scm.com/docs)
* [Atlassian Git - Tutoriály & Postupy](https://www.atlassian.com/git/) * [Atlassian Git - Tutoriály & Postupy](https://www.atlassian.com/git/)
* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf) * [Git - jednoducho](https://rogerdudler.github.io/git-guide/index.html)
* [Git - jednoducho](http://rogerdudler.github.io/git-guide/index.html) * [Pro Git](https://git-scm.com/book/en/v2)
* [Pro Git](http://www.git-scm.com/book/en/v2) * [Úvod do Gitu a GitHubu pre začiatočníkov (Tutoriál)](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
* [Úvod do Gitu a GitHubu pre začiatočníkov (Tutoriál)](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners) * [Git Pre Informatikov](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -32,7 +32,7 @@ Versiyon kontrol, zaman içerisinde dosya(lar)daki değişikliği kaydeden siste
* Dağınık versiyon kontrolü değişimin paylaşılmasına odaklanır. Her değişiminin benzersiz bir adı vardır. * Dağınık versiyon kontrolü değişimin paylaşılmasına odaklanır. Her değişiminin benzersiz bir adı vardır.
* Dağınık sistemlerin belirlenmiş bir yapısı yoktur. Git ile kolayca SVN'deki gibi merkezi bir sistem elde edebilirsin. * Dağınık sistemlerin belirlenmiş bir yapısı yoktur. Git ile kolayca SVN'deki gibi merkezi bir sistem elde edebilirsin.
[Daha fazla bilgi](http://git-scm.com/book/en/Getting-Started-About-Version-Control) [Daha fazla bilgi](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
### Neden Git? ### Neden Git?
@ -56,7 +56,7 @@ Bir git repo'su .git dizini ve çalışma ağacından oluşur.
### .git Dizini (repository bileşeni) ### .git Dizini (repository bileşeni)
.git dizini bütün konfigrasyon, log, dallanma, HEAD ve daha fazlasını tutar. .git dizini bütün konfigrasyon, log, dallanma, HEAD ve daha fazlasını tutar.
[detaylı liste](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [detaylı liste](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### Çalışma Ağacı (repository bileşeni) ### Çalışma Ağacı (repository bileşeni)
@ -95,11 +95,6 @@ head, commit'e bir göstericidir. Bir repository herhangi bir sayıda head'e sah
* Staged - Modified edilmiş bir dosyayı, sonraki commit'e gitmek üzere işaretler. * Staged - Modified edilmiş bir dosyayı, sonraki commit'e gitmek üzere işaretler.
* Committed - Dosyalar Git Veritabanına commit'lendi. * Committed - Dosyalar Git Veritabanına commit'lendi.
### Kavramsal Kaynaklar
* [Bilgisayar Bilimciler için Git](http://eagain.net/articles/git-for-computer-scientists/)
* [Tasarımcılar için Git](http://hoth.entp.com/output/git_for_designers.html)
## Komutlar ## Komutlar
### init ### init
@ -122,7 +117,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
$ git config --global user.name "My Name" $ git config --global user.name "My Name"
``` ```
[git config hakkında daha fazla bilgi için.](http://git-scm.com/docs/git-config) [git config hakkında daha fazla bilgi için.](https://git-scm.com/docs/git-config)
### help ### help
@ -181,7 +176,7 @@ $ git add HelloWorld.java
# add a file in a nested dir # add a file in a nested dir
$ git add /path/to/file/HelloWorld.c $ git add /path/to/file/HelloWorld.c
# Regular Expression support! # Shell glob patterns make it easy to specify multiple files:
$ git add ./*.java $ git add ./*.java
# You can also add everything in your working directory to the staging area. # You can also add everything in your working directory to the staging area.
@ -332,7 +327,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
``` ```
Daha fazla örnek için Daha fazla örnek için
[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -483,7 +478,7 @@ $ git stash pop
Şimdi kendi işine dönmeye hazırsın! Şimdi kendi işine dönmeye hazırsın!
[Ek Okuma.](http://git-scm.com/book/en/v1/Git-Tools-Stashing) [Ek Okuma.](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
### rebase (dikkat) ### rebase (dikkat)
@ -496,7 +491,7 @@ Branch'ta commit'lenen tüm değişimleri al ve onları başka bir branch'ta tek
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Ek Okuma.](http://git-scm.com/book/en/Git-Branching-Rebasing) [Ek Okuma.](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
### reset (dikkat) ### reset (dikkat)
@ -576,24 +571,24 @@ $ git rm /pather/to/the/file/HelloWorld.c
## Daha Fazla Bilgi ## Daha Fazla Bilgi
* [tryGit - Git'i öğrenmek için eğlenceli interaktif bir yol](http://try.github.io/levels/1/challenges/1) * [Git Dallanmayı Öğren - Git'i web üzerinde öğrenmek için en görsel ve interaktif yol](https://learngitbranching.js.org/)
* [Git Dallanmayı Öğren - Git'i web üzerinde öğrenmek için en görsel ve interaktif yol](http://learngitbranching.js.org/)
* [Udemy Git Tutorial: Kapsayıcı bir kılavuz](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/) * [Udemy Git Tutorial: Kapsayıcı bir kılavuz](https://blog.udemy.com/git-tutorial-a-comprehensive-guide/)
* [Git Immersion - Git'in temelinden başlayan bir tur](http://gitimmersion.com/) * [Git Immersion - Git'in temelinden başlayan bir tur](https://gitimmersion.com/)
* [git-scm - Video Tutorial](http://git-scm.com/videos) * [git-scm - Video Tutorial](https://git-scm.com/videos)
* [git-scm - Dökümantasyon](http://git-scm.com/docs) * [git-scm - Dökümantasyon](https://git-scm.com/docs)
* [Atlassian Git - Tutorial & Workflow](https://www.atlassian.com/git/) * [Atlassian Git - Tutorial & Workflow](https://www.atlassian.com/git/)
* [SalesForce Kopya Kağıdı](http://res.cloudinary.com/hy4kyit2a/image/upload/SF_git_cheatsheet.pdf) * [SalesForce Kopya Kağıdı](https://res.cloudinary.com/hy4kyit2a/image/upload/SF_git_cheatsheet.pdf)
* [Git - Basit bir kılavuz](http://rogerdudler.github.io/git-guide/index.html) * [git - basit rehber](https://rogerdudler.github.io/git-guide/index.tr.html)
* [Pro Git](http://www.git-scm.com/book/en/v2) * [Pro Git](https://git-scm.com/book/tr/v2)
* [Yeni başlayanlar için Git ve GitHub](http://product.hubspot.com/blog/git-and-github-tutorial-for-beginners) * [Yeni başlayanlar için Git ve GitHub](https://product.hubspot.com/blog/git-and-github-tutorial-for-beginners)
* [Bilgisayar Bilimciler için Git](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -26,7 +26,7 @@ Version Control là một hệ thống ghi lại những thay đổi ở một t
* Quản lý phiên bản phân tán (Distributed Versioning) tập trung vào việc chia sẻ các thay đổi. Mỗi sự thay đổi có một mã định dạng (id) duy nhất. * Quản lý phiên bản phân tán (Distributed Versioning) tập trung vào việc chia sẻ các thay đổi. Mỗi sự thay đổi có một mã định dạng (id) duy nhất.
* Các hệ phân tán không có cấu trúc định sẵn. Bạn có thể thay đổi một kiểu SVN, hệ phân tán, với git. * Các hệ phân tán không có cấu trúc định sẵn. Bạn có thể thay đổi một kiểu SVN, hệ phân tán, với git.
[Thông tin thêm](http://git-scm.com/book/en/Getting-Started-About-Version-Control) [Thông tin thêm](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
### Tại Sao Dùng Git? ### Tại Sao Dùng Git?
@ -50,7 +50,7 @@ Một git repository bao gồm thư mục .git & tree đang làm việc.
### Thư mục .git (thành phần của một repository) ### Thư mục .git (thành phần của một repository)
Thư mục .git chứa tất cả các cấu hình, log, nhánh, HEAD, và hơn nữa. Thư mục .git chứa tất cả các cấu hình, log, nhánh, HEAD, và hơn nữa.
[Danh Sách Chi Tiết.](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [Danh Sách Chi Tiết.](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### Tree Đang Làm (thành phần của một repository) ### Tree Đang Làm (thành phần của một repository)
@ -79,12 +79,6 @@ con trỏ này sẽ cập nhật tự động và trỏ đến commit mới nh
HEAD là một con trỏ đến branch hiện tại. Một repo chỉ có một HEAD *đang hoạt động*. HEAD là một con trỏ đến branch hiện tại. Một repo chỉ có một HEAD *đang hoạt động*.
head là một con trỏ đến bất kỳ commit nào. Một repo có thể có nhiều head. head là một con trỏ đến bất kỳ commit nào. Một repo có thể có nhiều head.
### Các Tài Nguyên Mang Tính Khái Niệm
* [Git For Computer Scientists](http://eagain.net/articles/git-for-computer-scientists/)
* [Git For Designers](http://hoth.entp.com/output/git_for_designers.html)
## Các Lệnh ## Các Lệnh
@ -113,7 +107,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
$ git config --global user.name "My Name" $ git config --global user.name "My Name"
``` ```
[Tìm hiểu thêm về git config.](http://git-scm.com/docs/git-config) [Tìm hiểu thêm về git config.](https://git-scm.com/docs/git-config)
### help ### help
@ -258,7 +252,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
``` ```
Google để xem thêm các ví dụ Google để xem thêm các ví dụ
[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -347,7 +341,7 @@ Lấy tất cả các thay đổi mà đã được commit trên một nhánh, v
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[Đọc Thêm.](http://git-scm.com/book/en/Git-Branching-Rebasing) [Đọc Thêm.](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
### reset (thận trọng) ### reset (thận trọng)
@ -386,16 +380,12 @@ $ git rm /pather/to/the/file/HelloWorld.c
## Thông tin thêm ## Thông tin thêm
* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1) * [git-scm - Video Tutorials](https://git-scm.com/videos)
* [git-scm - Video Tutorials](http://git-scm.com/videos) * [git-scm - Documentation](https://git-scm.com/docs)
* [git-scm - Documentation](http://git-scm.com/docs)
* [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/) * [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf) * [Git - the simple guide](https://rogerdudler.github.io/git-guide/index.html)
* [Git - the simple guide](http://rogerdudler.github.io/git-guide/index.html)
* [Git For Computer Scientists](https://eagain.net/articles/git-for-computer-scientists/)

View File

@ -24,7 +24,7 @@ Git可以为你的项目保存若干快照以此来对整个项目进行版
* 分布式版本控制则更注重共享更改。每一次更改都有唯一的标识 * 分布式版本控制则更注重共享更改。每一次更改都有唯一的标识
* 分布式系统没有预定的结构。你也可以用git很轻松的实现SVN风格的集中式系统控制 * 分布式系统没有预定的结构。你也可以用git很轻松的实现SVN风格的集中式系统控制
[更多信息](http://git-scm.com/book/en/Getting-Started-About-Version-Control) [更多信息](https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control)
### 为什么要使用Git ### 为什么要使用Git
@ -47,7 +47,7 @@ Git可以为你的项目保存若干快照以此来对整个项目进行版
### .git 目录(版本库的一部分) ### .git 目录(版本库的一部分)
.git 目录包含所有的配置、日志、分支信息、头指针等 .git 目录包含所有的配置、日志、分支信息、头指针等
[详细列表](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html) [详细列表](https://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
### 工作目录 (版本库的一部分) ### 工作目录 (版本库的一部分)
@ -74,12 +74,6 @@ Git可以为你的项目保存若干快照以此来对整个项目进行版
头指针是一个指向当前分支的指针,一个版本库只有一个当前活动的头指针 头指针是一个指向当前分支的指针,一个版本库只有一个当前活动的头指针
而头则可以指向版本库中任意一个提交,每个版本库也可以有多个头 而头则可以指向版本库中任意一个提交,每个版本库也可以有多个头
### 其他形象化解释
* [给计算机科学家的解释](http://eagain.net/articles/git-for-computer-scientists/)
* [给设计师的解释](http://hoth.entp.com/output/git_for_designers.html)
## 命令 ## 命令
@ -105,7 +99,7 @@ $ git config --global user.email "MyEmail@Zoho.com"
$ git config --global user.name "My Name" $ git config --global user.name "My Name"
``` ```
[关于git的更多设置](http://git-scm.com/docs/git-config) [关于git的更多设置](https://git-scm.com/docs/git-config)
### 帮助 ### 帮助
@ -247,7 +241,7 @@ $ git grep -e 'arrayListName' --and \( -e add -e remove \)
``` ```
更多的例子可以查看: 更多的例子可以查看:
[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja) [Git Grep Ninja](https://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
### log ### log
@ -324,7 +318,7 @@ $ git push origin master
$ git rebase master experimentBranch $ git rebase master experimentBranch
``` ```
[更多阅读](http://git-scm.com/book/en/Git-Branching-Rebasing) [更多阅读](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
### reset (谨慎使用) ### reset (谨慎使用)
@ -361,12 +355,10 @@ $ git rm /pather/to/the/file/HelloWorld.c
## 更多阅读 ## 更多阅读
* [tryGit - 学习Git的有趣方式](http://try.github.io/levels/1/challenges/1) * [git-scm - 视频教程](https://git-scm.com/videos)
* [git-scm - 视频教程](http://git-scm.com/videos) * [git-scm - 文档](https://git-scm.com/docs)
* [git-scm - 文档](http://git-scm.com/docs)
* [Atlassian Git - 教程与工作流程](https://www.atlassian.com/git/) * [Atlassian Git - 教程与工作流程](https://www.atlassian.com/git/)
* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf) * [给计算机科学家的解释](https://eagain.net/articles/git-for-computer-scientists/)