From bd3355a0d9e78c45f86019cf966f493394b2dbff Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Thu, 2 Feb 2012 22:44:40 -0800 Subject: [PATCH] [perl #108754] perlgit.pod: Stress rebase more MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Based on a patch from Andreas König, but rearranged and reworded. --- pod/perlgit.pod | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pod/perlgit.pod b/pod/perlgit.pod index b14ad7e..ee524f9 100644 --- a/pod/perlgit.pod +++ b/pod/perlgit.pod @@ -728,10 +728,18 @@ benefit from a summary of the set's purpose, you should use a merge commit. You should perform your work on a L, which you should regularly rebase against blead to ensure that your code is not broken by blead moving. -When you have finished your work and performed a final rebase and test, -you can merge it into master like this (assuming your work was on the +When you have finished your work, please perform a final rebase and +test. Linear history is something that gets lost with every +commit on blead, but a final rebase makes the history linear +again, making it easier for future maintainers to see what has +happened. Rebase as follows (assuming your work was on the branch C<< committer/somework >>): + $ git checkout committer/somework + $ git rebase blead + +Then you can merge it into master like this: + $ git checkout blead $ git merge --no-ff --no-commit committer/somework $ git commit -a -- 1.8.3.1