summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-02-16 18:19:18 +0000
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-02-16 18:19:18 +0000
commit0c24b290ae02b2ab3304f51d5e11e85eb3659eae (patch)
tree26400d56d593dc49e015b5f55c3d923c4daefdb2
parent9d77ce3f21b279b465beef4cb5fcbc9efafef340 (diff)
downloadperl-0c24b290ae02b2ab3304f51d5e11e85eb3659eae.tar.gz
Mention why it's a good idea to use topic branches for everything
Most of this is derived from Dan Golden's E-Mail to me on perl5-porters with the subject "[PATCH] Add comments to gv.c about variable implementation" where I'd submitted a patch without using a topic branch.
-rw-r--r--pod/perlrepository.pod8
1 files changed, 8 insertions, 0 deletions
diff --git a/pod/perlrepository.pod b/pod/perlrepository.pod
index af2229d750..2f29aef7de 100644
--- a/pod/perlrepository.pod
+++ b/pod/perlrepository.pod
@@ -299,6 +299,14 @@ which is the short form of
% git branch orange
% git checkout orange
+Creating a topic branch makes it easier for the maintainers to rebase
+or merge back into the master blead for a more linear history. If you
+don't work on a topic branch the maintainer has to manually cherry
+pick your changes onto blead before they can be applied.
+
+That'll get you scolded on perl5-porters, so don't do that. Be
+Awesome.
+
Then make your changes. For example, if Leon Brocard changes his name
to Orange Brocard, we should change his name in the AUTHORS file: