Katrina Owen 54c9ae187f Clarify git instructions in project guide. Fixes #11796 ...

The git model uses `upstream master` to refer to the branch on
the remote repository, and `upstream/master` to refer to the
local cache of the upstream branch.

I did not explain the difference in the docs (that seemed a bit
excessive), but I did clarify the instructions so that it refers
to the correct concept in each place.

Signed-off-by: Katrina Owen <katrina.owen@gmail.com>

2015-03-26 19:24:14 -07:00

..

images

Update contributor docs and triage to match new labeling system

2015-03-21 15:55:33 -07:00

advanced-contributing.md

Cleanup: new project docs fix-ups (alternative)

2015-03-07 23:40:34 +01:00

coding-style.md

Cleanup: new project docs fix-ups (alternative)

2015-03-07 23:40:34 +01:00

create-pr.md

Update contributor docs and triage to match new labeling system

2015-03-21 15:55:33 -07:00

doc-style.md

Cleanup: new project docs fix-ups (alternative)

2015-03-07 23:40:34 +01:00

find-an-issue.md

Clarify git instructions in project guide. Fixes #11796

2015-03-26 19:24:14 -07:00

get-help.md

cleanup: docs: remove temporary inline styles

2015-03-17 22:48:28 +01:00

glossary.md

Rewrite the Contributing tree as Project in preparation for the Docker birthday.

2015-03-06 14:10:55 -08:00

make-a-contribution.md

Update contributor docs and triage to match new labeling system

2015-03-21 15:55:33 -07:00

review-pr.md

Update contributor docs and triage to match new labeling system

2015-03-21 15:55:33 -07:00

set-up-dev-env.md

Merge pull request #11846 from voltaic/master

2015-03-26 18:09:28 -07:00

set-up-git.md

Merge pull request #11793 from lolilo/update-project-doc

2015-03-26 17:57:45 -07:00

software-required.md

Breaking out the project into more granular pieces

2015-03-12 22:27:49 -07:00

test-and-docs.md

Fix spelling

2015-03-26 20:24:01 +01:00

who-written-for.md

Breaking out the project into more granular pieces

2015-03-12 22:27:49 -07:00

work-issue.md

Clarify git instructions in project guide. Fixes #11796

2015-03-26 19:24:14 -07:00