projects
/
platform
/
upstream
/
perl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c19ffe
)
perlgit: C<<...>> -> C<< ... >>
author
Father Chrysostomos
<sprout@cpan.org>
Sun, 10 Jul 2011 13:15:58 +0000
(06:15 -0700)
committer
Father Chrysostomos
<sprout@cpan.org>
Sun, 10 Jul 2011 13:15:58 +0000
(06:15 -0700)
pod/perlgit.pod
patch
|
blob
|
history
diff --git
a/pod/perlgit.pod
b/pod/perlgit.pod
index
0e855fa
..
eef06da
100644
(file)
--- a/
pod/perlgit.pod
+++ b/
pod/perlgit.pod
@@
-730,7
+730,7
@@
branches and rewriting history>, 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
-branch C<<
committer/somework
>>):
+branch C<<
committer/somework
>>):
$ git checkout blead
$ git merge --no-ff --no-commit committer/somework