Git基础知识.ppt

2013-05-08 * gitwow is on its way… 2013-05-08 * This is the main thing to remember about Git if you want the rest of your learning process to go smoothly. Git has three main states that your files can reside in: committed, modified, and staged. Committed means that the data is safely stored in your local database. Modified means that you have changed the file but have not committed it to your database yet. Staged means that you have marked a modified file in its current version to go into your next commit snapshot. 2013-05-08 * *2011-10-19 * Git Workflow - Boot Session The initial cloning and setup is described in the “https://lte-wiki.rnd.ki.sw.ericsson.se/mediawiki/index.php/Lte_Git/GetSetup” page on the LTE wiki. ‘git init’ is not used in LTE other than by the administrators since that’s for starting out from scratch. The working directory is the scratchpad for doing development, where code editing as well as merges and rebases take place before being added and committed. This is basically all the files you work with and see as designer. The index (or “staging area”) is a temporary storage where you can edit and pick and chose what will go into your next commit. Say you have done some work but there are multiple changes that you would like to go into separate commits, e.g. they are not logically coherent and are different parts of a feature, or you might have been doing some testing with some parameterization that you would like to keep for another commit or stash and apply on some other branch. After you are satisfied with how the changes look in the staging area, you commit them, which means that you make the changes permanent in your local repo(sitory). The local repo will store the changes on a per file basis as blob objects, which are files that contain the diff / delta towards the versions of the files in the previous commit. The blob objects are referenced through the SHA-1 tag which is working in two ways, both as a security/authen