summaryrefslogtreecommitdiff
path: root/docs/internals/contributing/committing-code.txt
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-06-08 11:40:33 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-06-08 11:40:33 +0200
commit1f203f84d01508345997f921bc9feed8b4ff2fc5 (patch)
treea0d935e658f70eab6c43d34eac3489aebed0afb3 /docs/internals/contributing/committing-code.txt
parent329bb9296f402c6e7d7b648937b72b13a6f5756c (diff)
Explained an alternative way to fetch a branch.
This avoids adding each contributor as a remote. Thanks Fruneau for the report.
Diffstat (limited to 'docs/internals/contributing/committing-code.txt')
-rw-r--r--docs/internals/contributing/committing-code.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index 8f0ceea44d..a77a5762b5 100644
--- a/docs/internals/contributing/committing-code.txt
+++ b/docs/internals/contributing/committing-code.txt
@@ -76,6 +76,12 @@ checkout the branch and work from there::
git remote add <contributor> https://github.com/<contributor>/django.git
git checkout pull_xxxxx <contributor> <contributor's pull request branch>
+Yet another alternative is to fetch the branch without adding the
+contributor's repository as a remote::
+
+ git fetch https://github.com/<contributor>/django.git
+ git checkout -b pull_xxxxx FETCH_HEAD
+
At this point, you can work on the code and continue as above.
GitHub provides a one-click merge functionality for pull requests. This should