background preloader

GIT

Facebook Twitter

Brancher et fusionner : les bases. Suivons un exemple simple de branche et fusion dans une utilisation que vous feriez dans le monde réel.

Brancher et fusionner : les bases

Vous feriez les étapes suivantes : travailler sur un site web ;créer une branche pour un nouvel article sur lequel vous souhaiteriez travailler ;réaliser quelques tâches sur cette branche. À cette étape, vous recevez un appel pour vous dire qu'un problème critique a été découvert et qu'il faut le régler au plus tôt. Vous feriez ce qui suit : revenir à la branche de production ;créer une branche et y développer le correctif ;après un test, fusionner la branche de correctif et pousser le résultat à la production ;rebasculer à la branche initiale et continuer le travail.

Le branchement de base Premièrement, supposons que vous travaillez sur votre projet et avez déjà quelques commits (voir figure 3-10). Figure 3-10. Vous avez décidé de travailler sur le problème numéroté #53 dans le suivi de faits techniques que votre entreprise utilise. C'est un raccourci pour : Figure 3-11. Figure 3-12. Setting Up the Server. Let’s walk through setting up SSH access on the server side.

Setting Up the Server

In this example, you’ll use the authorized_keys method for authenticating your users. We also assume you’re running a standard Linux distribution like Ubuntu. First, you create a 'git' user and a .ssh directory for that user. $ sudo adduser git $ su git $ cd $ mkdir .ssh Next, you need to add some developer SSH public keys to the authorized_keys file for that user. . $ cat /tmp/id_rsa.john.pub ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCB007n/ww+ouN4gSLKssMxXnBOvf9LGt4L ojG6rs6hPB09j9R/T17/x4lhJA0F3FR1rP6kYBRsWj2aThGw6HXLm9/5zytK6Ztg3RPKK+4k Yjh6541NYsnEAZuXz0jTTyAUfrtU3Z5E003C4oxOj6H0rfIF1kKI9MAQLMdpGW1GYEIgS9Ez Sdfd8AcCIicTDWbqLAcU4UpkaX8KyGlLwsNuuGztobF8m72ALC/nLF6JLtPofwFBlgc+myiv O7TCUSBdLQlgMVOFq1I2uPWQOkOWQAHukEOmfjy2jctxSDBQ220ymjaNsHT4kgtZg2AYYgPq dAv8JggJICUvax2T9va5 gsg-keypair You just append them to your authorized_keys file: $ chmod -R go= ~/.ssh.

What is a bare git repository? By Jon Saints - 26 Jan 2011 UPDATED: 5/30/2015 - Fixed inaccurate description of where files are stored in bare git repositories and updated explanations of both bare and no-bare repositories What is the difference between a repository created using the git init command and the git init --bare command?

What is a bare git repository?

Repositories created with the git init command are called working directories. In the top level folder of the repository you will find two things: A .git subfolder with all the git related revision history of your repo A working tree, or checked out copies of your project files. Repositories created with git init --bare are called bare repos. Why use one or the other? Well, a working repository created with git init is for… working. A bare repository created with git init --bare is for… sharing. Because no one ever makes edits directly to files in the shared bare repo, a working tree is not needed. To summarize. How to Run Your Own Git Server. Manage your code on your own server by running a bare, basic Git server or via the GitLab GUI tool (shown here).

How to Run Your Own Git Server

This month we are celebrating the anniversary of Git, a versioning system developed by Linus Torvalds. Git is being used by millions of users around the globe; crossing borders and boundaries. There are companies like GitHub which are now offering code hosting services based on Git. According to reports, GitHub, a code hosting site, is the world's largest code hosting service. The company claims that there are 9.2M people collaborating right now across 21.8M repositories on GitHub. Run your own Git server GitHub is a great service, however there are some limitations and restrictions, especially if you are an individual or a small player. In cases like these or when you want more control, the best path is to run Git on your own server. In this tutorial we are going to talk about two methods of managing your code on your own server.

Documentation. Documentation Reference Reference Manual The official and comprehensive man pages that are included in the Git package itself.

Documentation

Quick reference guides: GitHub Cheat Sheet (PDF) | Visual Git Cheat Sheet (SVG | PNG) Book Pro Git is written by Scott Chacon and Ben Straub and published by Apress. Print copies can be purchased from Amazon and PDF, mobi, and ePub versions are available for free. Back to book → Scott Chacon Pro Git Pro Git Book information and downloads Videos See all videos → External Links The External Links section is a curated, ever-evolving collection of tutorials, books, videos, and other Git resources.

Version Control for Designers. – This works on the assumption the person has no previous knowledge about SCM – What have you done for me lately?

Version Control for Designers

Version control, also known as source control or revision control is an integral part of any development workflow. Why? It is essentially a communication tool, just like email or IM, but it works with code rather than human conversation. Version control allows programmers to easily communicate their work to other programmersallows a team to share codemaintains separate “production” versions of code that are always deployableallows simultaneous development of different features on the same codebasekeeps track of all old versions of filesprevents work being overwritten What is version control? Version control, alternately known as revision control or source code management, is a system that maintains versions of files at progressive stages of development. There are many different programs for version control. How to use Git.