diff options
| author | Aristotle Pagaltzis <pagaltzis@gmx.de> | 2015-07-21 12:23:55 +0200 |
|---|---|---|
| committer | Aristotle Pagaltzis <pagaltzis@gmx.de> | 2015-07-21 12:23:55 +0200 |
| commit | cc116ce7f30f9861a5b501456e5dfaf8e57de587 (patch) | |
| tree | c303177418145dd06e51834f55b3fdbf5deed90d /pod/perlgit.pod | |
| parent | 04edae75060b165358c49e90531901bb186e160e (diff) | |
| download | perl-cc116ce7f30f9861a5b501456e5dfaf8e57de587.tar.gz | |
perlgit: standardize verbatims to 2-space indent
Diffstat (limited to 'pod/perlgit.pod')
| -rw-r--r-- | pod/perlgit.pod | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pod/perlgit.pod b/pod/perlgit.pod index 7e56ff0ca5..a79f3a1e34 100644 --- a/pod/perlgit.pod +++ b/pod/perlgit.pod @@ -288,7 +288,7 @@ If you want to delete your temporary branch, you may do so with: Assuming that you'd like to commit all the changes you've made as a single atomic unit, run this command: - % git commit -a + % git commit -a (That C<-a> tells git to add every file you've changed to this commit. New files aren't automatically added to your commit when you use @@ -519,27 +519,27 @@ this via the following formula (see the explanation about C<refspec>'s in the git push documentation for details) after you have rebased your branch: - # first rebase - $ git checkout $user/$topic - $ git fetch - $ git rebase origin/blead + # first rebase + $ git checkout $user/$topic + $ git fetch + $ git rebase origin/blead - # then "delete-and-push" - $ git push origin :$user/$topic - $ git push origin $user/$topic + # then "delete-and-push" + $ git push origin :$user/$topic + $ git push origin $user/$topic B<NOTE:> it is forbidden at the repository level to delete any of the "primary" branches. That is any branch matching C<m!^(blead|maint|perl)!>. Any attempt to do so will result in git producing an error like this: - $ git push origin :blead - *** It is forbidden to delete blead/maint branches in this repository - error: hooks/update exited with error code 1 - error: hook declined to update refs/heads/blead - To ssh://perl5.git.perl.org/perl - ! [remote rejected] blead (hook declined) - error: failed to push some refs to 'ssh://perl5.git.perl.org/perl' + $ git push origin :blead + *** It is forbidden to delete blead/maint branches in this repository + error: hooks/update exited with error code 1 + error: hook declined to update refs/heads/blead + To ssh://perl5.git.perl.org/perl + ! [remote rejected] blead (hook declined) + error: failed to push some refs to 'ssh://perl5.git.perl.org/perl' As a matter of policy we do B<not> edit the history of the blead and maint-* branches. If a typo (or worse) sneaks into a commit to blead or |