From b5fbca3f00d2697f63690179f8b91891217a69e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sun, 16 Jun 2013 21:26:18 +0200 Subject: [PATCH] Change branch name for consistency across guidelines --- CONTRIBUTING.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.txt b/CONTRIBUTING.txt index 03e8deb6..a1d3b666 100644 --- a/CONTRIBUTING.txt +++ b/CONTRIBUTING.txt @@ -46,7 +46,7 @@ For a more detailed discussion, read these :doc:`detailed documents git checkout master git pull upstream master - git checkout your-branch + git checkout transform-speedups git rebase master If any conflicts occur, fix the according files and continue:: @@ -56,7 +56,7 @@ For a more detailed discussion, read these :doc:`detailed documents Finally, you must push your rebased branch:: - git push -f + git push -f origin transform-speedups (If you are curious, here's a further discussion on the `dangers of rebasing `__. Also