diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-18 11:10:46 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-18 11:10:46 -0500 |
| commit | c897283849abbe7f7e6506c2c3b179ff0fd3f9d2 (patch) | |
| tree | d545dc3fe7a3a2c2c9cadab630d815c47776e54a /docs/git.rst | |
| parent | e2c6436e3e7c654a8d4196ac378debf185c74fa4 (diff) | |
| parent | 5a994e37c2947d20e3aedfb78f9d6194dd59d506 (diff) | |
| download | mediagoblin-c897283849abbe7f7e6506c2c3b179ff0fd3f9d2.tar.lz mediagoblin-c897283849abbe7f7e6506c2c3b179ff0fd3f9d2.tar.xz mediagoblin-c897283849abbe7f7e6506c2c3b179ff0fd3f9d2.zip | |
Merge branch 'master' into configobj
Conflicts:
setup.py
Diffstat (limited to 'docs/git.rst')
| -rw-r--r-- | docs/git.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/git.rst b/docs/git.rst index 8eb038b2..c3f7ccce 100644 --- a/docs/git.rst +++ b/docs/git.rst @@ -136,7 +136,7 @@ Slartibartfast does the following: 4. Slartibartfast pushes his changes to his clone (the remote is named ``origin``):: - git push origin issue_42 + git push origin issue_42 --set-upstream 5. Slartibartfast adds a comment to issue 42 with the url for his repository and the name of the branch he put the code in. He also |