From a220e421f933cc82c5e33d85507e08a823415741 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Mon, 18 Jul 2011 09:09:13 -0700 Subject: documentation/dev-manual/dev-manual-newbie.xml: bad links corrected. (From yocto-docs rev: 77560db929ead2b4ce5cd04dd3a125b941cb4875) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/dev-manual/dev-manual-newbie.xml | 41 +++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'documentation') diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 68a2f4a211..d4f94c0cf1 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml @@ -49,7 +49,7 @@ Wikipedia has a good historical description of the Open Source Philosophy - here. + here. @@ -204,50 +204,51 @@ omits the many arguments they support. See the Git documentation for complete descriptions and strategies on how to use these commands: - git init – Initializes an empty Git repository. + git init – Initializes an empty Git repository. You cannot use Git commands unless you have a .git repository. - git clone – Creates a clone of a repository. + 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 to the index that + git add – Adds updated file contents to the index that Git uses to track changes. All files that have changed must be added before they can be committed. - git commit – Creates a “commit” that documents the changes you made. + 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 - added and committed. - git checkout <branch-name> - Changes + git status – Reports any modified files that + possibly need added and committed. + git checkout <branch-name> - Changes your working branch. 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. - git branch – Reports existing branches and tells you which - branch in which you are currently working. - git pull – Retrieves information from an upstream Git + git branch – Reports existing branches and + tells you which branch in which you are currently working. + git pull – Retrieves information from an upstream Git repository and places it in your local Git repository. You use this command to make sure you are synchronized with the upstream repository from which the project’s maintainer uses to pull changes into the master repository. - git push – Sends all your local changes you have committed - to an upstream Git repository. + git push – Sends all your local changes you + have committed to an upstream Git repository. The maintainer of the project draws from these repositories when adding your changes to the project’s master repository. - git merge – Combines or adds changes from one local branch of - your repository with another 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”. A typical workflow is to create a temporary branch for isolated work, make and commit your changes, switch to the master branch, merge the changes in the temporary branch with the master branch, and then delete the temporary branch - git cherry-pick – Choose and apply specific commits from - one branch into another branch. + git cherry-pick – Choose and apply specific + commits from one branch into another branch. There are times when you might not be able to merge all the changes in one branch with another but need to pick out certain ones. - gitk – Provides a GUI view of the branches and changes in - your local Git repository. + gitk – Provides a GUI view of the branches + and changes in your local Git repository. This command is a good way to see where things have diverged in your local repository. - git log – Reports a history of your changes to the + git log – Reports a history of your changes to the repository. -- cgit v1.2.3-54-g00ecf