X-Git-Url: http://git.openafs.org/?p=openafs-wiki.git;a=blobdiff_plain;f=AFSLore%2FGitDevelopers.mdwn;h=5bbe6d94494c983fd9727d164edf37b765df980f;hp=595703dee0275b2c5b825f32bf3d3066c8ed2759;hb=14eba4fc9beade404e3b1ac7b78087daa771fe37;hpb=ea8b59e4e8b05d01c2a36e05c9e3d5a21355105c diff --git a/AFSLore/GitDevelopers.mdwn b/AFSLore/GitDevelopers.mdwn index 595703d..5bbe6d9 100644 --- a/AFSLore/GitDevelopers.mdwn +++ b/AFSLore/GitDevelopers.mdwn @@ -30,7 +30,7 @@ When you want to update the local repository with the central OpenAFS one, runni git pull -will pull all of the new changes into your local repository, and merge those changes into your correct working tree. Note that whilst this is fine when you are browsing the repository, you may want to exercise more control over how upstream changes are merged into your development code. +will pull all of the new changes into your local repository, and merge those changes into your current working tree. Note that whilst this is fine when you are browsing the repository, you may want to exercise more control over how upstream changes are merged into your development code. ## Checkout a particular branch