From 78ec6f7c076e95448ca0f136031be2042f72a5b2 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Tue, 9 Apr 2013 14:43:37 -0700 Subject: dev-manual: Edits to "Basic Commands" section. (From yocto-docs rev: 3cd5c68d610d7ec2fe4c8d1ad64b05833bb31425) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/dev-manual/dev-manual-newbie.xml | 27 ++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'documentation') diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index b42fafd770..a365e07f1d 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml @@ -992,7 +992,7 @@ - If you don’t know much about Git, we suggest you educate + If you don’t know much about Git, you should educate yourself by visiting the links previously mentioned. @@ -1007,24 +1007,24 @@ git clone: Creates a clone of a repository. During collaboration, this command allows you to create a local repository that is on equal footing with a fellow developer’s repository. - git add: Adds updated file contents + git add: Stages updated file contents to the index that Git uses to track changes. - You must add all files that have changed before you can commit them. - git commit: Creates a “commit” that documents + You must stage all files that have changed before you can commit them. + git commit: Creates a "commit" that documents the changes you made. Commits are used for historical purposes, for determining if a maintainer of a project will allow the change, and for ultimately pushing the change from your local Git repository into the project’s upstream (or master) repository. git status: Reports any modified files that - possibly need to be added and committed. + possibly need staged and committed. git checkout <branch-name>: Changes your working branch. - This command is analogous to “cd”. + This command is analogous to "cd". git checkout –b <working-branch>: Creates a working branch on your local machine where you can isolate work. It is a good idea to use local branches when adding specific features or changes. - This way if you don’t like what you have done you can easily get rid of the work. + This way if you do not like what you have done you can easily get rid of the work. git branch: Reports existing local branches and tells you the branch in which you are currently working. @@ -1037,13 +1037,16 @@ repository and places it in your local Git repository. You use this command to make sure you are synchronized with the repository from which you are basing changes (.e.g. the master branch). - git push: Sends all your local changes you - have committed to an upstream Git repository (e.g. a contribution repository). - The maintainer of the project draws from these repositories when adding your changes to the - project’s master repository. + git push: + Sends all your committed local changes to an upstream Git + repository (e.g. a contribution repository). + The maintainer of the project draws from these repositories + when adding changes to the project’s master repository or + other development branch. + git merge: Combines or adds changes from one local branch of your repository with another branch. - When you create a local Git repository, the default branch is named “master”. + When you create a local Git repository, the default branch is named "master". A typical workflow is to create a temporary branch for isolated work, make and commit your changes, switch to your local master branch, merge the changes from the temporary branch into the local master branch, and then delete the temporary branch. -- cgit v1.2.3-54-g00ecf