
=encoding euc-jp

=for comment
Consistent formatting of this file is achieved with:
  perl ./Porting/podtidy pod/perlrepository.pod

=head1 NAME

=begin original

perlrepository - Using the Perl source repository

=end original

perlrepository - Perl 末□旦伉禾斥玄伉毛銀丹

=head1 SYNOPSIS

=begin original

All of Perl's source code is kept centrally in a Git repository at
I<perl5.git.perl.org>. The repository contains many Perl revisions from
Perl 1 onwards and all the revisions from Perforce, the version control
system we were using previously. This repository is accessible in
different ways.

=end original

Perl及末□旦戊□玉反允屯化﹜I<perl5.git.perl.org> 及 Git 伉禾斥玄伉卞
螂醱棟咥今木化中引允﹝
仇及伉禾斥玄伉卞反﹜Perl 1 動嫦及聶仁及 Perl 伉申斥亦件午﹜
動蟆銀迕仄化中凶田□斥亦件棟咥扑旦氾丞匹丐月 Perforce 及允屯化及
伉申斥亦件互殖引木化中引允﹝
仇及伉禾斥玄伉卞反﹜今引介引卅杅芊匹失弁本旦匹五引允﹝

=begin original

The full repository takes up about 80MB of disk space. A check out of
the blead branch (that is, the main development branch, which contains
bleadperl, the development version of perl 5) takes up about 160MB of
disk space (including the repository). A build of bleadperl takes up
about 200MB (including the repository and the check out).

=end original

白伙伉禾斥玄伉反沶 80 MB及犯奴旦弁旦矢□旦毛銀迕仄引允﹝
blead 皮仿件民(勾引曰﹜perl 5 及釩�田□斥亦件匹丐月 bleadperl 毛殖戈
丟奶件釩�皮仿件民)井日及民尼永弁失它玄反﹜沶 160 MB及犯奴旦弁旦矢□旦
(伉禾斥玄伉毛殖戈)毛銀迕仄引允﹝
bleadperl 及申伙玉反﹜沶 200 MB(伉禾斥玄伉午民尼永弁失它玄毛殖戈)毛
銀迕仄引允﹝

=head1 GETTING ACCESS TO THE REPOSITORY

(伉禾斥玄伉卞失弁本旦允月)

=head2 READ ACCESS VIA THE WEB

(Web 煩苀及厶心慇心失弁本旦)

=begin original

You may access the repository over the web. This allows you to browse
the tree, see recent commits, subscribe to RSS feeds for the changes,
search for particular commits and more. You may access it at:

=end original

Web 煩苀匹伉禾斥玄伉卞失弁本旦匹五引允﹝
仇木卞方曰﹜汁伉□及輔寰﹜瘉嗤及戊立永玄及刓憎﹜庍凳及 RSS 白奴□玉及壽厶﹜
冂爛及戊立永玄及腹綢卅升互第チ卞卅曰引允﹝
慼及樺赭井日失弁本旦匹五引允:

  http://perl5.git.perl.org/perl.git

=begin original

A mirror of the repository is found at:

=end original

伉禾斥玄伉及立仿□反動票卞丐曰引允:

  http://github.com/mirrors/perl

=head2 READ ACCESS VIA GIT

(Git 煩苀及厶心慇心失弁本旦)

=begin original

You will need a copy of Git for your computer. You can fetch a copy of
the repository using the Git protocol (which uses port 9418):

=end original

丐卅凶及戊件疋亙□正迕及 Git 互优邰匹允﹝
Git 皿伕玄戊伙(禾□玄 9418 毛銀迕)毛銀迕仄化﹜伉禾斥玄伉及戊疋□毛
白尼永民匹五引允﹝

  % git clone git://perl5.git.perl.org/perl.git perl-git

=begin original

This clones the repository and makes a local copy in the F<perl-git>
directory.

=end original

仇木卞方曰﹜伉禾斥玄伉反呁擠今木﹜F<perl-git> 犯奴伊弁玄伉卞
伕□市伙戊疋□互綜嶽今木引允﹝

=begin original

If your local network does not allow you to use port 9418, then you can
fetch a copy of the repository over HTTP (this is at least 4x slower):

=end original

伕□市伙生永玄伐□弁匹禾□玄 9418 及銀迕互袱第今木化中卅中樺寧反﹜
HTTP 煩苀匹伉禾斥玄伉及戊疋□毛白尼永民匹五引允(仇木反劑卅仁午手 4 ム
斕簧匹允)﹝

  % git clone http://perl5.git.perl.org/perl.git perl-http

=begin original

This clones the repository and makes a local copy in the F<perl-http>
directory.

=end original

仇木卞方曰﹜伉禾斥玄伉互呁擠今木﹜F<perl-http> 犯奴伊弁玄伉卞
伕□市伙戊疋□互綜嶽今木引允﹝

=head2 WRITE ACCESS TO THE REPOSITORY

(伉禾斥玄伉尺及踏五慇心失弁本旦)

=begin original

If you are a committer, then you can fetch a copy of the repository
that you can push back on with:

=end original

戊立永正匹丐木壬﹜皿永扑亙田永弁第チ卅伉禾斥玄伉及戊疋□毛
潸丿允月仇午互匹五引允﹝

  % git clone ssh://perl5.git.perl.org/perl.git perl-ssh

=begin original

This clones the repository and makes a local copy in the F<perl-ssh>
directory.

=end original

仇木卞方曰﹜伉禾斥玄伉互呁擠今木﹜F<perl-ssh> 犯奴伊弁玄伉卞
伕□市伙戊疋□互綜嶽今木引允﹝

=begin original

If you cloned using the git protocol, which is faster than ssh, then
you will need to modify the URL for the origin remote to enable
pushing. To do that edit F<.git/config> with L<git-config(1)> like
this:

=end original

ssh 方曰手嫖簧卅 git 皿伕玄戊伙毛銀迕仄化弁伕□件毛綜嶽仄凶樺寧反﹜
皿永扑亙毛肣躲卞允月凶戶卞 origin remote 及凶戶及 URL 毛
庍凳允月优邰互丐曰引允﹝
公丹允月凶戶卞反﹜F<.git/config> 毛慼及方丹卞彸螂仄引允:

  % git config remote.origin.url ssh://perl5.git.perl.org/perl.git

=begin original

You can also set up your user name and e-mail address. Most people do
this once globally in their F<~/.gitconfig> by doing something like:

=end original

交□扒□抩午齬閡丟□伙失玉伊旦毛澀爛允月仇午手匹五引允﹝
幻午氏升及諦反﹜動票及方丹卞允月仇午匹 F<~/.gitconfig> 匹弘伕□田伙卞
域蘸仇木毛墊中引允:

  % git config --global user.name "𦍑�var Arnfj繹r簸 Bjarmason"
  % git config --global user.email avarab@gmail.com

=begin original

However if you'd like to override that just for perl then execute then
execute something like the following in F<perl-git>:

=end original

仄井仄﹜perl 分仃卞覆仄化仇木毛庍凳仄凶中樺寧反﹜
F<perl-git> 匹慼及方丹卅手及毛撢墊仄引允:

  % git config user.email avar@cpan.org

=begin original

It is also possible to keep C<origin> as a git remote, and add a new
remote for ssh access:

=end original

C<origin> 毛 git remote 午仄化問儅仄﹜ssh 失弁本旦迕及蕙仄中 remote 毛
馨笛允月仇午手第チ匹允:

  % git remote add camel perl5.git.perl.org:/perl.git

=begin original

This allows you to update your local repository by pulling from
C<origin>, which is faster and doesn't require you to authenticate, and
to push your changes back with the C<camel> remote:

=end original

仇木卞方曰﹜C<origin> 井日皿伙仄化伕□市伙伉禾斥玄伉毛凳蕙匹五引允;
仇木反方曰嫖簧匹﹜カ據毛优邰午仄引六氏;
引凶﹜C<camel> 伉乒□玄匹庍凳毛皿永扑亙田永弁允月仇午手匹五引允﹝

  % git fetch camel
  % git push camel

=begin original

The C<fetch> command just updates the C<camel> refs, as the objects
themselves should have been fetched when pulling from C<origin>.

=end original

C<fetch> 戊穴件玉反簽卞 C<camel> refs 毛凳蕙允月分仃匹允;
卅兮卅日﹜左皮斥尼弁玄憤蟲反 C<origin> 井日皿伙允月午五卞
白尼永民今木月屯五分井日匹允﹝

=head2 A NOTE ON CAMEL AND DROMEDARY

(camel 午 dromedary 卞楮允月鏜啦)

=begin original

The committers have SSH access to the two servers that serve
C<perl5.git.perl.org>. One is C<perl5.git.perl.org> itself (I<camel>),
which is the 'master' repository. The second one is
C<users.perl5.git.perl.org> (I<dromedary>), which can be used for
general testing and development. Dromedary syncs the git tree from
camel every few minutes, you should not push there. Both machines also
have a full CPAN mirror in /srv/CPAN, please use this. To share files
with the general public, dromedary serves your ~/public_html/ as
C<http://users.perl5.git.perl.org/~yourlogin/>

=end original

戊立永正反﹜C<perl5.git.perl.org> 卞扔□申旦毛羼間允月き勾及
扔□田卞失弁本旦匹五引允﹝
C<perl5.git.perl.org> 憤褥 (I<camel>) 匹﹜
仇木互＞穴旦正□＝伉禾斥玄伉匹允﹝
き勾杴反 C<users.perl5.git.perl.org> (I<dromedary>) 匹﹜
域�讀卅氾旦玄午釩�卞銀迕匹五引允﹝
dromedary 反醒坌仍午卞 camel 井日 git 汁伉□毛⑺渝允月及匹﹜公仇卞
皿永扑亙仄化反中仃引六氏﹝
徆杅及穴扑件卞反 /srv/CPAN 卞敦蟈卅 CPAN 立仿□手丐月及匹﹜
仇木毛銀勻化仁分今中﹝
dromedary 反白央奶伙毛域�跤釩允月凶戶卞﹜
~/public_html/ 毛 C<http://users.perl5.git.perl.org/~yourlogin/> 午仄化
羼間仄化中引允﹝

=begin original

These hosts have fairly strict firewalls to the outside. Outgoing, only
rsync, ssh and git are allowed. For http and ftp, you can use
http://webproxy:3128 as proxy. Incoming, the firewall tries to detect
attacks and blocks IP addresses with suspicious activity. This
sometimes (but very rarely) has false positives and you might get
blocked. The quickest way to get unblocked is to notify the admins.

=end original

仇木日及石旦玄反﹜陸朿卞覆仄化井卅曰虞傘卅白央奶失它巧□伙毛儅勻化中引允﹝
霜耨反 rsync﹜ssh﹜git 分仃互袱第今木化中引允﹝
http 午 ftp 卞覆仄化反﹜皿伕平扑午仄化 http://webproxy:3128 毛銀迕匹五引允﹝
熬耨反﹜白央奶失它巧□伙反僎猾毛腹請仄﹜翕歹仄中失弁氾奴申氾奴毛儅勾
IP 失玉伊旦毛皮伕永弁仄方丹午仄引允﹝
仇木反凜卞(�橘卞引木卞)貲腹請互丐曰﹜皮伕永弁今木月第チ嶺互丐曰引允﹝
皮伕永弁毛荸輪允月瘉手棵簽卅杅芊反﹜棟咥樊卞騷襞允月仇午匹允﹝

=begin original

These two boxes are owned, hosted, and operated by booking.com. You can
reach the sysadmins in #p5p on irc.perl.org or via mail to
C<perl5-porters@perl.org>

=end original

仇木日き勾及示永弁旦反﹜booking.com 卞方勻化赭肣今木﹜石旦玄今木﹜
捫採今木化中引允﹝
扑旦氾丞棟咥樊卞反﹜irc.perl.org 及 #p5p 井﹜
C<perl5-porters@perl.org> 尺及丟□伙匹洘俀匹五引允﹝

=head1 OVERVIEW OF THE REPOSITORY

(伉禾斥玄伉及陬邰)

=begin original

Once you have changed into the repository directory, you can inspect
it.

=end original

伉禾斥玄伉犯奴伊弁玄伉卞庍凳毛笛尹凶日﹜公及犯奴伊弁玄伉毛腹犖匹五引允﹝

=begin original

After a clone the repository will contain a single local branch, which
will be the current branch as well, as indicated by the asterisk.

=end original

弁伕□件綜嶽詨﹜伉禾斥玄伉卞反簽域及伕□市伙皮仿件民互殖引木引允﹝
仇及伕□市伙皮仿件民反﹜失旦正伉旦弁匹憎今木化中月方丹卞﹜
蜇箕及皮仿件民卞手卅曰引允﹝

  % git branch
  * blead

=begin original

Using the -a switch to C<branch> will also show the remote tracking
branches in the repository:

=end original

C<branch> 卞 -a 旦奶永民毛銀迕允月午﹜伉禾斥玄伉〇及
伉乒□玄玄仿永平件弘皮仿件民手刓憎今木引允:

  % git branch -a
  * blead
    origin/HEAD
    origin/blead
  ...

=begin original

The branches that begin with "origin" correspond to the "git remote"
that you cloned from (which is named "origin"). Each branch on the
remote will be exactly tracked by theses branches. You should NEVER do
work on these remote tracking branches. You only ever do work in a
local branch. Local branches can be configured to automerge (on pull)
from a designated remote tracking branch. This is the case with the
default branch C<blead> which will be configured to merge from the
remote tracking branch C<origin/blead>.

=end original

"origin" 匹銨引月皮仿件民反﹜弁伕□件葭及 "git remote"
("origin" 午中丹抩蟆) 卞覆殺仄引允﹝
伉乒□玄及備皮仿件民反﹜仇木日及皮仿件民卞方勻化懇割卞馨濘今木引允﹝
仇木日及伉乒□玄馨濘皮仿件民匹反濮覆卞綜僅仄卅中匹仁分今中﹝
伕□市伙皮仿件民匹及心綜僅仄引允﹝
伕□市伙皮仿件民反﹜隙爛今木凶伉乒□玄馨濘皮仿件民井日
(皿伙凜卞)憤⑹穴□斥允月方丹卞厭嶽匹五引允﹝
仇木反﹜伉乒□玄馨濘皮仿件民 C<origin/blead> 井日穴□斥允月方丹卞
厭嶽今木化中月犯白巧伙玄皮仿件民 C<blead> 及樺寧匹允﹝

=begin original

You can see recent commits:

=end original

瘉嗤及戊立永玄毛葦日木引允:

  % git log

=begin original

And pull new changes from the repository, and update your local
repository (must be clean first)

=end original

伉禾斥玄伉井日蕙仄中庍凳毛皿伙仄﹜伕□市伙伉禾斥玄伉毛凳蕙仄引允
(瘉賡卞弁伉□件卞允月优邰互丐曰引允)﹝

  % git pull

=begin original

Assuming we are on the branch C<blead> immediately after a pull, this
command would be more or less equivalent to:

=end original

皿伙及躂詨卞皮仿件民 C<blead> 卞中月午移爛允月午﹜仇及戊穴件玉反
動票午幻廿羈笠卞卅曰引允:

  % git fetch
  % git merge origin/blead

=begin original

In fact if you want to update your local repository without touching
your working directory you do:

=end original

撢端﹜綜僅犯奴伊弁玄伉卞失弁本旦六內卞伕□市伙伉禾斥玄伉毛凳蕙仄凶中樺寧反﹜
慼及方丹卞仄引允:

  % git fetch

=begin original

And if you want to update your remote-tracking branches for all defined
remotes simultaneously you can do

=end original

引凶﹜爛聒今木凶允屯化及伉乒□玄卞覆仄化伉乒□玄馨濘皮仿件民毛
⑺凜卞凳蕙仄凶中樺寧反﹜動票及方丹卞墊丹仇午互匹五引允:

  % git remote update

=begin original

Neither of these last two commands will update your working directory,
however both will update the remote-tracking branches in your
repository.

=end original

瘉詨及き勾及戊穴件玉反升切日手綜僅犯奴伊弁玄伉毛凳蕙仄引六氏互﹜升切日手
伉禾斥玄伉〇及伉乒□玄馨濘皮仿件民毛凳蕙仄引允﹝

=begin original

To switch to another branch:

=end original

職及皮仿件民卞濠曰贅尹月卞反:

  % git checkout origin/maint-5.8-dor

=begin original

To make a local branch of a remote branch:

=end original

伉乒□玄皮仿件民及伕□市伙皮仿件民毛綜月卞反:

  % git checkout -b maint-5.10 origin/maint-5.10

=begin original

To switch back to blead:

=end original

blead 卞枑月卞反:

  % git checkout blead

=head2 FINDING OUT YOUR STATUS

(蜇箕及橇謫毛割カ允月)

=begin original

The most common git command you will use will probably be

=end original

云公日仁手勻午手方仁銀丹 git 戊穴件玉反:

  % git status

=begin original

This command will produce as output a description of the current state
of the repository, including modified files and unignored untracked
files, and in addition it will show things like what files have been
staged for the next commit, and usually some useful information about
how to change things. For instance the following:

=end original

仇及戊穴件玉反﹜庍凳今木凶白央奶伙支拑骰今木化中卅中
馨濘今木化中卅中白央奶伙卅升﹜伉禾斥玄伉及蜇箕及橇謫及濩抸毛
請恘午仄化戲嶽仄引允﹝
今日卞﹜慼及戊立永玄及凶戶卞旦氾□斥件弘今木凶白央奶伙支﹜
騷橘反庍凳杅芊卞楮允月肣迕卅樹扷毛刓憎仄引允﹝
凶午尹壬﹜慼及方丹卞卅曰引允:

  $ git status
  # On branch blead
  # Your branch is ahead of 'origin/blead' by 1 commit.
  #
  # Changes to be committed:
  #   (use "git reset HEAD <file>..." to unstage)
  #
  #       modified:   pod/perlrepository.pod
  #
  # Changed but not updated:
  #   (use "git add <file>..." to update what will be committed)
  #
  #       modified:   pod/perlrepository.pod
  #
  # Untracked files:
  #   (use "git add <file>..." to include in what will be committed)
  #
  #       deliberate.untracked

=begin original

This shows that there were changes to this document staged for commit,
and that there were further changes in the working directory not yet
staged. It also shows that there was an untracked file in the working
directory, and as you can see shows how to change all of this. It also
shows that there is one commit on the working branch C<blead> which has
not been pushed to the C<origin> remote yet. B<NOTE>: that this output
is also what you see as a template if you do not provide a message to
C<git commit>.

=end original

仇木反﹜戊立永玄及凶戶卞旦氾□斥件弘今木凶仇及妐踏卞庍凳互丐勻凶仇午午﹜
引分旦氾□斥件弘今木化中卅中伐□平件弘犯奴伊弁玄伉卞
今日卞庍凳互丐勻凶仇午毛憎仄化中引允﹝
引凶﹜伐□平件弘犯奴伊弁玄伉卞馨濘今木化中卅中白央奶伙互
丐勻凶仇午手憎仄化中引允;
引凶﹜仇木日允屯化毛庍凳允月杅芊毛憎仄化中引允﹝
引凶﹜C<origin> 伉乒□玄卞引分皿永扑亙今木化中卅中伐□平件弘皮仿件民
C<blead> 卞域勾及戊立永玄互丐月仇午手憎仄化中引允﹝
B<鏜>: 仇及請恘反﹜C<git commit> 卞丟永本□斥毛羼間仄卅中樺寧卞
氾件皿伊□玄午仄化刓憎今木月手及匹手丐曰引允﹝

=begin original

Assuming that you'd like to commit all the changes you've just made as a
a single atomic unit, run this command:

=end original

漆墊勻凶允屯化及庍凳毛域勾及失玄立永弁交瓦永玄午仄化戊立永玄仄凶中樺寧反﹜
慼及戊穴件玉毛撢墊仄引允:

   % git commit -a

=begin original

(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 C<commit
-a> If you want to add files or to commit some, but not all of your
changes, have a look at the documentation for C<git add>.)

=end original

(C<-a> 反 git 卞覆仄化﹜庍凳仄凶允屯化及白央奶伙毛仇及戊立永玄卞
馨笛允月方丹卞隙憎仄引允﹝
C<commit -a> 毛銀迕仄化手﹜蕙仄中白央奶伙反憤⑹讀卞戊立永玄卞馨笛今木引六氏﹝
白央奶伙毛馨笛仄凶中樺寧支﹜域朿及庍凳毛戊立永玄仄凶中樺寧反﹜
C<git add> 及妐踏毛輔寰仄化仁分今中﹝

=begin original

Git will start up your favorite text editor, so that you can craft a
commit message for your change. See L</Commit message> below for more
information about what makes a good commit message.

=end original

Git 反﹜丐卅凶互庍凳〇芢及戊立永玄丟永本□斥毛綜嶽匹五月方丹卞﹜
云竣卞じ曰及氾平旦玄巨犯奴正毛粟⑹仄引允﹝
贗濠卅戊立永玄丟永本□斥毛綜嶽允月杅芊卞楮允月今日卅月樹扷卞勾中化反﹜
詨課及 L</Commit message> 毛輔寰仄化仁分今中﹝

=begin original

Once you've finished writing your commit message and exited your editor,
git will write your change to disk and tell you something like this:

=end original

戊立永玄丟永本□斥毛踏五蔽尹化巨犯奴正毛蔽弇允月午﹜
git 反庍凳毛犯奴旦弁卞踏五慇心﹜動票及方丹卅丟永本□斥毛請恘仄引允:

  Created commit daf8e63: explain git status and stuff about remotes
   1 files changed, 83 insertions(+), 3 deletions(-)

=begin original

If you re-run C<git status>, you should see something like this:

=end original

C<git status> 毛瘋撢墊允月午﹜動票及方丹卅手及互丿日木引允:

  % git status
  # On branch blead
  # Your branch is ahead of 'origin/blead' by 2 commits.
  #
  # Untracked files:
  #   (use "git add <file>..." to include in what will be committed)
  #
  #       deliberate.untracked
  nothing added to commit but untracked files present (use "git add" to track)

=begin original

When in doubt, before you do anything else, check your status and read
it carefully, many questions are answered directly by the git status
output.

=end original

窒井翕杽互丐月樺寧卞反﹜窒井毛允月蟆卞憤坌及旦氾□正旦毛民尼永弁仄化
鏜啦蕉仁厶氏匹仁分今中;
聶仁及翕杽卞覆仄化反﹜git status 請恘互躂濤蠶尹化仁木引允﹝

=head1 SUBMITTING A PATCH

(由永民毛髑嘍允月)

=begin original

If you have a patch in mind for Perl, you should first get a copy of
the repository:

=end original

Perl 迕及由永民毛嗶尹化中月樺寧反﹜引內伉禾斥玄伉及戊疋□毛
じ澎允月优邰互丐曰引允﹝

  % git clone git://perl5.git.perl.org/perl.git perl-git

=begin original

Then change into the directory:

=end original

公木井日犯奴伊弁玄伉毛庍凳仄引允:

  % cd perl-git

=begin original

Alternatively, if you already have a Perl repository, you should ensure
that you're on the I<blead> branch, and your repository is up to date:

=end original

丐月中反﹜允匹卞 Perl 伉禾斥玄伉毛儅勻化中月樺寧反﹜
I<blead> 皮仿件民卞中化﹜伉禾斥玄伉互瘉蕙匹丐月仇午毛割カ允月优邰互丐曰引允:

  % git checkout blead
  % git pull

=begin original

It's preferable to patch against the latest blead version, since this
is where new development occurs for all changes other than critical bug
fixes.  Critical bug fix patches should be made against the relevant
maint branches, or should be submitted with a note indicating all the
branches where the fix should be applied.

=end original

瘉蕙及 blead 田□斥亦件卞覆仄化由永民毛贗迕允月仇午毛云換戶仄引允﹝
仇木反﹜褐釐卅田弘膜懇動陸及允屯化及庍凳卞覆仄化蕙凶卅釩�互墊歹木月
樺赭匹丐月凶戶匹允﹝
褐釐卅田弘膜懇由永民反﹜楮洘允月丟奶件皮仿件民卞覆仄化綜嶽允月井﹜
膜懇互贗迕今木月允屯化及皮仿件民毛憎允丟乒午午手卞羼請允月优邰互丐曰引允﹝

=begin original

Now that we have everything up to date, we need to create a temporary
new branch for these changes and switch into it:

=end original

允屯化互瘉蕙及橇謫卞卅勻凶及匹﹜仇木日及庍凳卞覆仄化域凜讀卅
蕙仄中皮仿件民毛綜嶽仄﹜公及皮仿件民卞濠曰贅尹月优邰互丐曰引允:

  % git checkout -b orange

=begin original

which is the short form of

=end original

仇木反動票及手及及羶諒溥匹允

  % git branch orange
  % git checkout orange

=begin original

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.

=end original

玄疋永弁皮仿件民毛綜嶽允月仇午匹﹜丟件氾瓜反方曰伉瓦失卅咺昳及凶戶卞
master blead 卞伉矛□旦引凶反穴□斥田永弁允月仇午互棵簽卞卅曰引允﹝
玄疋永弁皮仿件民匹綜僅仄卅中樺寧﹜
丟件氾瓜反庍凳毛贗迕允月蟆卞澎⑹匹 blead 卞民尼伉□疋永弁允月
优邰互丐曰引允﹝

=begin original

That'll get you scolded on perl5-porters, so don't do that. Be
Awesome.

=end original

perl5-porters 匹撓日木月仇午卞卅月及匹﹜公氏卅仇午反仄卅中匹仁分今中﹝
丹引仁支曰引仄斤丹﹝

=begin original

Then make your changes. For example, if Leon Brocard changes his name
to Orange Brocard, we should change his name in the AUTHORS file:

=end original

慼卞﹜庍凳毛笛尹引允﹝
凶午尹壬﹜Leon Brocard 互抩蟆毛 Orange Brocard 卞庍凳仄凶樺寧﹜
AUTHORS 白央奶伙〇及抩蟆毛庍凳允月优邰互丐曰引允:

  % perl -pi -e 's{Leon Brocard}{Orange Brocard}' AUTHORS

=begin original

You can see what files are changed:

=end original

升及白央奶伙毛庍凳仄凶井毛葦日木引允:

  % git status
  # On branch orange
  # Changes to be committed:
  #   (use "git reset HEAD <file>..." to unstage)
  #
  #    modified:   AUTHORS
  #

=begin original

And you can see the changes:

=end original

公仄化庍凳互葦日木引允:

  % git diff
  diff --git a/AUTHORS b/AUTHORS
  index 293dd70..722c93e 100644
  --- a/AUTHORS
  +++ b/AUTHORS
  @@ -541,7 +541,7 @@    Lars Hecking                   <lhecking@nmrc.ucc.ie>
   Laszlo Molnar                  <laszlo.molnar@eth.ericsson.se>
   Leif Huhn                      <leif@hale.dkstat.com>
   Len Johnson                    <lenjay@ibm.net>
  -Leon Brocard                   <acme@astray.com>
  +Orange Brocard                 <acme@astray.com>
   Les Peters                     <lpeters@aol.net>
   Lesley Binks                   <lesley.binks@gmail.com>
   Lincoln D. Stein               <lstein@cshl.org>

=begin original

Now commit your change locally:

=end original

仇仇匹庍凳毛伕□市伙卞戊立永玄仄引允:

  % git commit -a -m 'Rename Leon Brocard to Orange Brocard'
  Created commit 6196c1d: Rename Leon Brocard to Orange Brocard
   1 files changed, 1 insertions(+), 1 deletions(-)

=begin original

You can examine your last commit with:

=end original

瘉詨及戊立永玄毛動票及方丹卞仄化腹犖匹五引允:

  % git show HEAD

=begin original

and if you are not happy with either the description or the patch
itself you can fix it up by editing the files once more and then issue:

=end original

濩抸引凶反由永民憤蟲卞坢簫匹五卅中樺寧反﹜白央奶伙毛手丹域蘸彸螂仄化井日
慼及戊穴件玉毛�墊允月仇午匹膜懇匹五引允:

  % git commit -a --amend

=begin original

Now you should create a patch file for all your local changes:

=end original

仇仇匹蟈化及伕□市伙卅庍凳及凶戶及由永民白央奶伙毛綜月屯五匹允:

  % git format-patch origin
  0001-Rename-Leon-Brocard-to-Orange-Brocard.patch

=begin original

You should now send an email to perl5-porters@perl.org with a
description of your changes, and include this patch file as an
attachment.  (See the next section for how to configure and use git to
send these emails for you.)

=end original

perl5-porters@perl.org 偶卞庍凳〇芢毛筏竭仄凶丟□伙毛霜耨仄﹜
仇及由永民白央奶伙毛驕尥白央奶伙午仄化霜勻化仁分今中
(仇木日及丟□伙毛霜耨允月凶戶卞 git 毛澀爛仄化銀丹杅芊卞勾中化反﹜
慼及濡毛輔寰仄化仁分今中)﹝

=begin original

If you want to delete your temporary branch, you may do so with:

=end original

域凜讀卅皮仿件民毛綽輪仄凶中卅日﹜動票及方丹卞匹五引允:

  % git checkout blead
  % git branch -d orange
  error: The branch 'orange' is not an ancestor of your current HEAD.
  If you are sure you want to delete it, run 'git branch -D orange'.
  % git branch -D orange
  Deleted branch orange.

=head2 Using git to send patch emails

=begin original

In your ~/git/perl repository, set the destination email to the
perl5-porters mailing list.

=end original

~/git/perl 伉禾斥玄伉匹﹜偶燮丟□伙毛 perl5-porter 丟□伉件弘伉旦玄卞
澀爛仄引允﹝

  $ git config sendemail.to perl5-porters@perl.org

=begin original

Then you can use git directly to send your patch emails:

=end original

公及詨﹜git 毛躂濤銀勻化由永民丟□伙毛霜月仇午互匹五引允:

  $ git send-email 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch

=begin original

You may need to set some configuration variables for your particular
email service provider. For example, to set your global git config to
send email via a gmail account:

=end original

冂爛及齬閡丟□伙扔□申旦皿伕田奶母卞覆仄化中仁勾井及澀爛庍醒毛澀爛允月
优邰互丐月井手仄木引六氏﹝
拺尹壬﹜gmail 失市它件玄煩苀匹齬閡丟□伙毛霜耨允月方丹卞
弘伕□田伙 git 毛澀爛允月卞反:

  $ git config --global sendemail.smtpserver smtp.gmail.com
  $ git config --global sendemail.smtpssl 1
  $ git config --global sendemail.smtpuser YOURUSERNAME@gmail.com

=begin original

With this configuration, you will be prompted for your gmail password
when you run 'git send-email'.  You can also configure
C<sendemail.smtppass> with your password if you don't care about having
your password in the .gitconfig file.

=end original

仇及澀爛匹反﹜'git send-email' 毛撢墊允月午五卞
gmail 由旦伐□玉及じ恘毛菲戶日木引允﹝
.gitconfig 白央奶伙卞由旦伐□玉毛忡繡仄凶仁卅中樺寧反﹜
C<sendemail.smtppass> 卞由旦伐□玉毛澀爛允月仇午手匹五引允﹝

=head2 A note on derived files

(ネ戲白央奶伙卞楮允月鏜啦)

=begin original

Be aware that many files in the distribution are derivative--avoid
patching them, because git won't see the changes to them, and the build
process will overwrite them. Patch the originals instead.  Most
utilities (like perldoc) are in this category, i.e. patch
utils/perldoc.PL rather than utils/perldoc. Similarly, don't create
patches for files under $src_root/ext from their copies found in
$install_root/lib.  If you are unsure about the proper location of a
file that may have gotten copied while building the source
distribution, consult the C<MANIFEST>.

=end original

犯奴旦玄伉申亙□扑亦件〇及聶仁及白央奶伙反
ネ戲讀卅手及匹丐月仇午卞鏜啦仄化仁分今中 -- 
公木日及白央奶伙卞由永民毛癲化月仇午反�仃化仁分今中;
卅兮卅日﹜git 反公木日卞覆允月庍凳毛葦月仇午互匹五內﹜
申伙玉皿伕本旦互公木日毛曉踏五允月井日匹允﹝
醫歹曰卞左伉斥瓜伙卞由永民毛癲化化仁分今中﹝
幻午氏升及交□氾奴伉氾奴(perldoc 卅升)反仇及市氾打伉卞丐曰引允;
允卅歹切﹜utils/perldoc 匹反卅仁 utils/perldoc.PL 卞由永民毛癲化引允﹝
⑺迋卞﹜$install_root/lib 卞丐月戊疋□井日 $src_root/ext 動票及白央奶伙卞
由永民毛綜嶽仄卅中匹仁分今中﹝
末□旦犯奴旦玄伉申亙□扑亦件及申伙玉醱卞戊疋□今木凶第チ嶺及丐月白央奶伙及
贗濠卅樺赭互歹井日卅中樺寧反﹜C<MANIFEST> 毛譬屯化仁分今中﹝

=begin original

As a special case, several files are regenerated by 'make regen' if
your patch alters C<embed.fnc>.  These are needed for compilation, but
are included in the distribution so that you can build perl without
needing another perl to generate the files.  You must test with these
regenerated files, but it is preferred that you instead note that
'make regen is needed' in both the email and the commit message, and
submit your patch without them.  If you're submitting a series of
patches, it might be best to submit the regenerated changes
immediately after the source-changes that caused them, so as to have
as little effect as possible on the bisectability of your patchset.

=end original

冂帎卅弗□旦午仄化﹜由永民互 C<embed.fnc> 毛庍凳仄凶樺寧﹜
'make regen' 卞方勻化中仁勾井及白央奶伙互瘋戲嶽今木引允﹝
仇木日反戊件由奶伙卞优邰匹允互﹜白央奶伙毛戲嶽允月凶戶卞
帎及 perl 毛优邰午允月仇午卅仁 perl 毛厭蹲匹五月方丹卞﹜
犯奴旦玄伉申亙□扑亦件卞殖引木化中引允﹝
仇木日及瘋戲嶽今木凶白央奶伙毛銀迕仄化氾旦玄允月优邰互丐曰引允互﹜
醫歹曰卞齬閡丟□伙午戊立永玄丟永本□斥及徆杅卞'make regen is needed' 午中丹
鏜啦毛馨笛仄﹜公木日卅仄匹由永民毛霜耨允月仇午毛云換戶仄引允﹝
域洘及由永民毛霜耨允月樺寧反﹜由永民本永玄及 bisect 第チ嶺尺及排黍毛
匹五月分仃劑卅仁允月凶戶卞﹜瘋戲嶽今木凶庍凳毛公及葆奢午卅勻凶
末□旦庍凳及躂詨卞霜耨允月仇午毛云換戶仄引允﹝

=for XXX

What should we recommend about binary files now? Do we need anything?

=head2 Getting your patch accepted

(丐卅凶及由永民毛熬仃じ木化手日丹凶戶卞)

=begin original

If you are submitting a code patch there are several things that
you need to do.

=end original

戊□玉由永民毛霜耨允月樺寧反﹜中仁勾井墊丹优邰互丐曰引允﹝

=over 4

=item Commit message

=begin original

As you craft each patch you intend to submit to the Perl core, it's
important to write a good commit message.

=end original

Perl 戊失卞髑嘍仄方丹午允月由永民毛綜嶽允月端卞反﹜
贗濠卅戊立永玄丟永本□斥毛綜嶽允月仇午互褐邰匹允﹝

=begin original

Your commit message should start with a description of the problem that
the patch corrects or new functionality that the patch adds.

=end original

戊立永玄丟永本□斥反﹜由永民卞方勻化膜懇今木月杽鎖及濩抸﹜引凶反
由永民卞方勻化馨笛今木月蕙窗チ及濩抸井日銨戶月优邰互丐曰引允﹝

=begin original

As a general rule of thumb, your commit message should let a programmer
with a reasonable familiarity with the Perl core quickly understand what
you were trying to do, how you were trying to do it and why the change
matters to Perl.

=end original

域�讀卅煩董禮午仄化﹜戊立永玄丟永本□斥卞方勻化﹜Perl 戊失卞丐月蠢蘸
擎騷仄凶皿伕弘仿穴□反﹜窒毛仄方丹午仄化中月及井﹜
升及方丹卞仄方丹午仄化中月及井﹜公仄化卅兮庍凳互 Perl 卞午勻化
褐邰卅及井毛允什卞咥荸匹五月反內匹允﹝

=over 4

=item What

=begin original

Your commit message should describe what part of the Perl core you're
changing and what you expect your patch to do.

=end original

戊立永玄丟永本□斥卞反﹜Perl戊失及升及朿坌毛庍凳仄方丹午仄化中月及井﹜
由永民卞窒毛渝謹仄化中月及井毛筏課允月优邰互丐曰引允﹝

=item Why

=begin original

Perhaps most importantly, your commit message should describe why the
change you are making is important. When someone looks at your change
in six months or six years, your intent should be clear.  If you're
deprecating a feature with the intent of later simplifying another bit
of code, say so. If you're fixing a performance problem or adding a new
feature to support some other bit of the core, mention that.

=end original

云公日仁瘉手褐邰卅及反﹜戊立永玄丟永本□斥卞﹜
憤坌互墊勻化中月庍凳互卅兮褐邰卅及井毛筏課允屯五分午中丹仇午匹允﹝
6 仳畸支6 コ詨卞簿井互丐卅凶及庍凳毛葦凶午五﹜
丐卅凶及啦豭反抸割匹丐月屯五匹允﹝
詨匹帎及戊□玉毛簽賬祭允月凶戶卞窗チ毛�蹂儔卞仄化中月及匹丐木壬﹜
公丹踏中化仁分今中﹝
由白巧□穴件旦及杽鎖毛膜懇仄凶曰﹜戊失及職及朿坌毛扔禾□玄允月凶戶及
蕙窗チ毛馨笛仄化中月及匹丐木壬﹜公及仇午卞蛻菴仄化仁分今中﹝

=item How

=begin original

While it's not necessary for documentation changes, new tests or
trivial patches, it's often worth explaining how your change works.
Even if it's clear to you today, it may not be clear to a porter next
month or next year.

=end original

妐踏及庍凳﹜蕙仄中氾旦玄﹜棵簽卅由永民卅升匹反优邰丐曰引六氏互﹜
庍凳互升及方丹卞窗チ允月井毛濩抸允月笠襖互丐月仇午互方仁丐曰引允﹝
漆ざ反反勻五曰仄化中化手﹜侳畸支侳コ卞反反勻五曰仄卅中井手仄木引六氏﹝

=back

=begin original

A commit message isn't intended to take the place of comments in your
code.  Commit messages should describe the change you made, while code
comments should describe the current state of the code.  If you've just
implemented a new feature, complete with doc, tests and well-commented
code, a brief commit message will often suffice.  If, however, you've
just changed a single character deep in the parser or lexer, you might
need to write a small novel to ensure that future readers understand
what you did and why you did it.

=end original

戊立永玄丟永本□斥反﹜戊□玉〇及戊丟件玄卞醫歹月手及匹反丐曰引六氏﹝
戊立永玄丟永本□斥卞反庍凳〇芢互筏課今木﹜戊□玉戊丟件玄卞反戊□玉及
蜇箕及橇謫互筏課今木引允﹝
蕙窗チ毛撢隸仄凶壬井曰匹﹜妐踏﹜氾旦玄﹜戊丟件玄尥五及戊□玉互
繚勻化中月樺寧反﹜棵簽卅戊立永玄丟永本□斥匹蝸坌卅仇午互方仁丐曰引允﹝
凶分仄﹜由□扔支儂嗥荸橾湛及梂蕉仁卞丐月 1 妐儂毛庍凳仄凶分仃及樺寧反﹜
冪侳及厶樊互憤坌及仄凶仇午午公及咥苀毛割撢卞咥荸匹五月方丹卞﹜
羶中凝濩毛踏仁优邰互丐月井手仄木引六氏﹝

=item Comments, Comments, Comments

(戊丟件玄﹜戊丟件玄﹜戊丟件玄)

=begin original

Be sure to adequately comment your code.  While commenting every line
is unnecessary, anything that takes advantage of side effects of
operators, that creates changes that will be felt outside of the
function being patched, or that others may find confusing should be
documented.  If you are going to err, it is better to err on the side
of adding too many comments than too few.

=end original

戊□玉卞贗濠卅戊丟件玄毛尥仃月方丹卞仄化仁分今中﹝
允屯化及墊卞戊丟件玄毛尥仃月优邰反丐曰引六氏互﹜梢遙閡及汏綜迕毛厙迕允月手及﹜
由永民今木化中月楮醒及陸朿匹普元日木月庍凳毛戲嶽允月手及﹜
引凶反職及諦互漁剄毛普元月第チ嶺及丐月手及反允屯化
妐踏祭允月优邰互丐曰引允﹝
聊切毛粟仇允樺寧反﹜戊丟件玄及醒互劑卅允亢月聊切方曰手﹜
戊丟件玄及醒互聶允亢月聊切及杅互引仄匹允﹝

=item Style

(旦正奶伙)

=begin original

In general, please follow the particular style of the code you are
patching.

=end original

域�卞﹜由永民毛贗迕允月戊□玉反冂爛及旦正奶伙卞蝨勻化仁分今中﹝

=begin original

In particular, follow these general guidelines for patching Perl
sources:

=end original

冂卞﹜Perl 末□旦卞由永民毛贗迕允月樺寧反﹜慼及域�讀卅布奶玉仿奶件卞
蝨勻化仁分今中:

    8-wide tabs (no exceptions!)
    4-wide indents for code, 2-wide indents for nested CPP #defines
    try hard not to exceed 79-columns
    ANSI C prototypes
    uncuddled elses and "K&R" style for indenting control constructs
    no C++ style (//) comments
    mark places that need to be revisited with XXX (and revisit often!)
    opening brace lines up with "if" when conditional spans multiple
        lines; should be at end-of-line otherwise
    in function definitions, name starts in column 0 (return value is on
        previous line)
    single space after keywords that are followed by parens, no space
        between function name and following paren
    avoid assignments in conditionals, but if they're unavoidable, use
        extra paren, e.g. "if (a && (b = c)) ..."
    "return foo;" rather than "return(foo);"
    "if (!foo) ..." rather than "if (foo == FALSE) ..." etc.

=item Testsuite

(氾旦玄旦奶□玄)

=begin original

If your patch changes code (rather than just changing documentation) you
should also include one or more test cases which illustrate the bug you're
fixing or validate the new functionality you're adding.  In general,
you should update an existing test file rather than create a new one.

=end original

由永民卞方勻化戊□玉互庍凳今木凶樺寧(簽卅月妐踏及庍凳匹反卅仁)﹜
膜懇仄方丹午仄化中月田弘毛濩抸允月井﹜
馨笛仄方丹午仄化中月蕙窗チ毛腹據允月氾旦玄弗□旦毛域勾動曉殖戶月
优邰互丐曰引允﹝
域�讀卞反﹜蕙仄中氾旦玄白央奶伙毛綜嶽允月及匹反卅仁﹜
湃繡及氾旦玄白央奶伙毛凳蕙允月屯五匹允﹝

=begin original

Your testsuite additions should generally follow these guidelines
(courtesy of Gurusamy Sarathy <gsar@activestate.com>):

=end original

氾旦玄旦奶□玄及馨笛反﹜域�讀卞慼及布奶玉仿奶件卞蝨丹优邰互丐曰引允
(Gurusamy Sarthy <gsar@activestate.com> 卞方月):

    Know what you're testing.  Read the docs, and the source.
    Tend to fail, not succeed.
    Interpret results strictly.
    Use unrelated features (this will flush out bizarre interactions).
    Use non-standard idioms (otherwise you are not testing TIMTOWTDI).
    Avoid using hardcoded test numbers whenever possible (the
      EXPECTED/GOT found in t/op/tie.t is much more maintainable,
      and gives better failure reports).
    Give meaningful error messages when a test fails.
    Avoid using qx// and system() unless you are testing for them.  If you
      do use them, make sure that you cover _all_ perl platforms.
    Unlink any temporary files you create.
    Promote unforeseen warnings to errors with $SIG{__WARN__}.
    Be sure to use the libraries and modules shipped with the version
      being tested, not those that were already installed.
    Add comments to the code explaining what you are testing for.
    Make updating the '1..42' string unnecessary.  Or make sure that
      you update it.
    Test _all_ behaviors of a given operator, library, or function:
      - All optional arguments
      - Return values in various contexts (boolean, scalar, list, lvalue)
      - Use both global and lexical variables
      - Don't forget the exceptional, pathological cases.

=back

=head1 ACCEPTING A PATCH

(由永民毛熬仃じ木月)

=begin original

If you have received a patch file generated using the above section,
you should try out the patch.

=end original

蟆課及濡匹毛銀勻化戲嶽今木凶由永民白央奶伙毛熬仃潸勻凶樺寧反﹜
由永民毛魂仄化心化仁分今中﹝

=begin original

First we need to create a temporary new branch for these changes and
switch into it:

=end original

引內﹜仇木日及庍凳及凶戶及域凜讀卅蕙仄中皮仿件民毛綜嶽仄﹜公及皮仿件民卞
濠曰贅尹月优邰互丐曰引允:

  % git checkout -b experimental

=begin original

Patches that were formatted by C<git format-patch> are applied with
C<git am>:

=end original

C<git format-patch> 匹白巧□穴永玄今木凶由永民反﹜C<git am> 匹贗迕今木引允:

  % git am 0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
  Applying Rename Leon Brocard to Orange Brocard

=begin original

If just a raw diff is provided, it is also possible use this two-step
process:

=end original

戲及 diff 分仃互羼間今木化中月樺寧反﹜慼及 2 蟾閉及皿伕本旦毛
銀迕允月仇午手匹五引允:

  % git apply bugfix.diff
  % git commit -a -m "Some fixing" --author="That Guy <that.guy@internets.com>"

=begin original

Now we can inspect the change:

=end original

仇仇匹庍凳毛腹犖匹五引允:

  % git show HEAD
  commit b1b3dab48344cff6de4087efca3dbd63548ab5e2
  Author: Leon Brocard <acme@astray.com>
  Date:   Fri Dec 19 17:02:59 2008 +0000

    Rename Leon Brocard to Orange Brocard

  diff --git a/AUTHORS b/AUTHORS
  index 293dd70..722c93e 100644
  --- a/AUTHORS
  +++ b/AUTHORS
  @@ -541,7 +541,7 @@ Lars Hecking                        <lhecking@nmrc.ucc.ie>
   Laszlo Molnar                  <laszlo.molnar@eth.ericsson.se>
   Leif Huhn                      <leif@hale.dkstat.com>
   Len Johnson                    <lenjay@ibm.net>
  -Leon Brocard                   <acme@astray.com>
  +Orange Brocard                 <acme@astray.com>
   Les Peters                     <lpeters@aol.net>
   Lesley Binks                   <lesley.binks@gmail.com>
   Lincoln D. Stein               <lstein@cshl.org>

=begin original

If you are a committer to Perl and you think the patch is good, you can
then merge it into blead then push it out to the main repository:

=end original

手仄丐卅凶互 Perl 及戊立永正匹﹜由永民互恌中手及分午閤丹卅日﹜
公木毛 blead 卞穴□斥仄化丟奶件及伉禾斥玄伉卞皿永扑亙允月仇午互匹五引允:

  % git checkout blead
  % git merge experimental
  % git push

=begin original

If you want to delete your temporary branch, you may do so with:

=end original

域凜讀卅皮仿件民毛綽輪仄凶中卅日﹜動票及方丹卞匹五引允:

  % git checkout blead
  % git branch -d experimental
  error: The branch 'experimental' is not an ancestor of your current HEAD.
  If you are sure you want to delete it, run 'git branch -D experimental'.
  % git branch -D experimental
  Deleted branch experimental.

=head1 CLEANING A WORKING DIRECTORY

(綜僅犯奴伊弁玄伉毛鄹輪允月)

=begin original

The command C<git clean> can with varying arguments be used as a
replacement for C<make clean>.

=end original

C<git clean> 戊穴件玉反今引介引卅婁醒匹 C<make clean> 及醫歹曰卞
銀丹仇午互匹五引允﹝

=begin original

To reset your working directory to a pristine condition you can do:

=end original

綜僅犯奴伊弁玄伉毛賡渝橇謫卞伉本永玄允月卞反﹜慼及方丹卞仄引允:

  % git clean -dxf

=begin original

However, be aware this will delete ALL untracked content. You can use

=end original

凶分仄﹜仇木卞方曰允屯化及馨濘今木化中卅中戊件氾件汁互綽輪今木引允﹝
慼及方丹卞允月午:

  % git clean -Xf

=begin original

to remove all ignored untracked files, such as build and test
byproduct, but leave any  manually created files alone.

=end original

申伙玉支氾旦玄及汏遣坁卅升﹜允屯化及拑骰今木凶
馨濘今木化中卅中白央奶伙毛綽輪仄引允﹝
凶分仄﹜澎⑹匹綜嶽仄凶白央奶伙反酸仄引允﹝

=begin original

If you only want to cancel some uncommitted edits, you can use C<git
checkout> and give it a list of files to be reverted, or C<git checkout
-f> to revert them all.

=end original

戊立永玄今木化中卅中彸螂分仃毛平乓件本伙仄凶中樺寧反﹜
C<git checkout> 毛銀迕仄化葭卞枑允白央奶伙及伉旦玄毛芨尹月井﹜
C<git checkout -f> 毛銀迕仄化允屯化毛葭卞枑允仇午互匹五引允﹝

=begin original

If you want to cancel one or several commits, you can use C<git reset>.

=end original

1勾引凶反呁醒及戊立永玄毛平乓件本伙仄凶中樺寧反﹜C<git reset> 毛
銀丹仇午互匹五引允﹝

=head1 BISECTING

(bisect)

=begin original

C<git> provides a built-in way to determine, with a binary search in
the history, which commit should be blamed for introducing a given bug.

=end original

C<git> 卞反﹜咺昳及き坌腹綢毛銀勻化﹜升及戊立永玄互冂爛及田弘毛
婁五粟仇仄凶午�か今木月屯五井毛�蠅允月澎蟾互賺心慇引木化中引允﹝

=begin original

Suppose that we have a script F<~/testcase.pl> that exits with C<0>
when some behaviour is correct, and with C<1> when it's faulty. You need
an helper script that automates building C<perl> and running the
testcase:

=end original

旦弁伉皿玄 F<~/testcase.pl> 互丐曰﹜⑹綜互懇仄中樺寧反 C<0> 匹蔽弇仄﹜
⑹綜互懇仄仁卅中樺寧反 C<1> 匹蔽弇允月午仄引允﹝
C<perl> 及厭蹲午氾旦玄弗□旦及撢墊毛憤⑹祭允月目伙由□旦弁伉皿玄互优邰匹允:

  % cat ~/run
  #!/bin/sh
  git clean -dxf
  # If you can use ccache, add -Dcc=ccache\ gcc -Dld=gcc to the Configure line
  # if Encode is not needed for the test, you can speed up the bisect by
  # excluding it from the runs with -Dnoextensions=Encode
  sh Configure -des -Dusedevel -Doptimize="-g"
  test -f config.sh || exit 125
  # Correct makefile for newer GNU gcc
  perl -ni -we 'print unless /<(?:built-in|command)/' makefile x2p/makefile
  # if you just need miniperl, replace test_prep with miniperl
  make -j4 test_prep
  [ -x ./perl ] || exit 125
  ./perl -Ilib ~/testcase.pl
  ret=$?
  [ $ret -gt 127 ] && ret=127
  git clean -dxf
  exit $ret

=begin original

This script may return C<125> to indicate that the corresponding commit
should be skipped. Otherwise, it returns the status of
F<~/testcase.pl>.

=end original

仇及旦弁伉皿玄反﹜覆殺允月戊立永玄毛旦平永皿允月仇午毛憎允 C<125> 毛
忒允樺寧互丐曰引允﹝
公木動陸及樺寧反﹜F<~/testcase.pl>及旦氾□正旦毛忒仄引允﹝

=begin original

You first enter in bisect mode with:

=end original

引內 bisect 乒□玉卞じ曰引允:

  % git bisect start

=begin original

For example, if the bug is present on C<HEAD> but wasn't in 5.10.0,
C<git> will learn about this when you enter:

=end original

拺尹壬﹜田弘互 C<HEAD> 卞丐勻化手 5.10.0 卞反卅井勻凶樺寧﹜C<git> 反
動票及方丹卞じ恘允月仇午匹仇木毛喀蓮仄引允:

  % git bisect bad
  % git bisect good perl-5.10.0
  Bisecting: 853 revisions left to test after this

=begin original

This results in checking out the median commit between C<HEAD> and
C<perl-5.10.0>. You can then run the bisecting process with:

=end original

仇及瑛絆﹜C<HEAD> 午 C<perl-5.10.0> 及醱棉及戊立永玄互
民尼永弁失它玄今木引允﹝
慼及方丹卞仄化 bisect 質咥毛撢墊仄引允:

  % git bisect run ~/run

=begin original

When the first bad commit is isolated, C<git bisect> will tell you so:

=end original

瘉賡及尕懇卅戊立永玄互坌峊今木月午﹜C<git bisect> 反慼及方丹卞蛻中引允:

  ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5 is first bad commit
  commit ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5
  Author: Dave Mitchell <davem@fdisolutions.com>
  Date:   Sat Feb 9 14:56:23 2008 +0000

      [perl #49472] Attributes + Unknown Error
      ...

  bisect run success

=begin original

You can peek into the bisecting process with C<git bisect log> and
C<git bisect visualize>. C<git bisect reset> will get you out of bisect
mode.

=end original

C<git bisect log> 午 C<git bisect visualize> 匹 bisect 質咥毛
ヅ五葦月仇午互匹五引允﹝
C<git bisect reset>反 bisect 乒□玉毛荸輪仄引允﹝

=begin original

Please note that the first C<good> state must be an ancestor of the
first C<bad> state. If you want to search for the commit that I<solved>
some bug, you have to negate your test case (i.e. exit with C<1> if OK
and C<0> if not) and still mark the lower bound as C<good> and the
upper as C<bad>. The "first bad commit" has then to be understood as
the "first commit where the bug is solved".

=end original

瘉賡及 C<good> 橇謫反﹜瘉賡及 C<bad> 橇謫及謐燮匹丐月优邰互丐月仇午卞
鏜啦仄化仁分今中﹝
窒日井及田弘毛 I<荸瑁仄凶> 戊立永玄毛腹綢仄凶中樺寧反﹜氾旦玄弗□旦毛
�鱉今六﹜
(勾引曰﹜OK 卅日 C<1> 匹蔽弇仄﹜公丹匹卅中卅日 C<0> 匹蔽弇允月)﹜
票蜃毛 C<good>﹜曉蜃毛 C<bad> 午穴□弁允月优邰互丐曰引允﹝
＞瘉賡及尕懇卅戊立永玄＝反﹜＞田弘互荸瑁今木凶瘉賡及戊立永玄＝午
荸澄允月优邰互丐曰引允﹝

=begin original

C<git help bisect> has much more information on how you can tweak your
binary searches.

=end original

C<git help bisect> 卞反﹜き坌繭綢毛ɵ譬幫允月杅芊卞楮允月樹扷互阰屾卞
迕啦今木化中引允﹝

=head1 SUBMITTING A PATCH VIA GITHUB

(GitHub 煩苀匹由永民毛髑嘍允月)

=begin original

GitHub is a website that makes it easy to fork and publish projects
with Git. First you should set up a GitHub account and log in.

=end original

GitHub 反﹜Git 匹皿伕斥尼弁玄毛白巧□弁仄化跤釩允月仇午毛芢啞卞允月
它尼皮扔奶玄匹允﹝
引內﹜GitHub 失市它件玄毛澀爛仄化伕弘奶件允月优邰互丐曰引允﹝

=begin original

Perl's git repository is mirrored on GitHub at this page:

=end original

Perl 及 git 伉禾斥玄伉反 GitHub 及仇及矢□斥卞立仿□伉件弘今木化中引允:

  http://github.com/mirrors/perl/tree/blead

=begin original

Visit the page and click the "fork" button. This clones the Perl git
repository for you and provides you with "Your Clone URL" from which
you should clone:

=end original

仇及矢□斥卞失弁本旦仄化﹜"fork"示正件毛弁伉永弁仄化仁分今中﹝
仇木反 Perl git 伉禾斥玄伉毛弁伕□件仄﹜弁伕□件葭及 "Your Clone URL" 毛
羼間仄引允:

  % git clone git@github.com:USERNAME/perl.git perl-github

=begin original

The same patch as above, using github might look like this:

=end original

蟆課午⑺元由永民匹﹜github 毛銀丹午慼及方丹卞卅曰引允:

  % cd perl-github
  % git remote add upstream git://perl5.git.perl.org/perl.git
  % git pull upstream blead
  % git checkout -b orange
  % perl -pi -e 's{Leon Brocard}{Orange Brocard}' AUTHORS
  % git commit -a -m 'Rename Leon Brocard to Orange Brocard'
  % git push origin orange

=begin original

The orange branch has been pushed to GitHub, so you should now send an
email to perl5-porters@perl.org with a description of your changes and
the following information:

=end original

orange 皮仿件民反 GitHub 卞皿永扑亙今木凶及匹﹜perl5-porters@perl.org 卞
庍凳〇芢云方太動票及樹扷毛丟□伙霜耨仄化仁分今中:

  http://github.com/USERNAME/perl/tree/orange
  git@github.com:USERNAME/perl.git branch orange

=head1 MERGING FROM A BRANCH VIA GITHUB

(GitHub 煩苀及皮仿件民毛穴□斥允月)

=begin original

If someone has provided a branch via GitHub and you are a committer,
you should use the following in your perl-ssh directory:

=end original

簿井互 GitHub 煩苀匹皮仿件民毛羼間仄化云曰﹜丐卅凶互戊立永正匹丐月樺寧﹜
perl-ssh 犯奴伊弁玄伉匹動票毛銀迕允月优邰互丐曰引允:

  % git remote add dandv git://github.com/dandv/perl.git
  % git fetch dandv

=begin original

Now you can see the differences between the branch and blead:

=end original

仇木匹﹜公及皮仿件民午 blead 及犒坌毛葦日木月方丹卞卅曰引仄凶:

  % git diff dandv/blead

=begin original

And you can see the commits:

=end original

公仄化戊立永玄毛刓憎匹五引允:

  % git log dandv/blead

=begin original

If you approve of a specific commit, you can cherry pick it:

=end original

冂爛及戊立永玄毛噩カ允月樺寧反﹜慼及方丹卞仄化薊鎗匹五引允:

  % git cherry-pick 3adac458cb1c1d41af47fc66e67b49c8dec2323f

=begin original

Or you could just merge the whole branch if you like it all:

=end original

引凶反﹜优邰卞殺元化皮仿件民蟈蟲毛穴□斥允月仇午手匹五引允:

  % git merge dandv/blead

=begin original

And then push back to the repository:

=end original

公仄化﹜伉禾斥玄伉卞皿永扑亙田永弁仄引允:

  % git push

=head1 TOPIC BRANCHES AND REWRITING HISTORY

(玄疋永弁皮仿件民午咺昳及踏五晶尹)

=begin original

Individual committers should create topic branches under
B<yourname>/B<some_descriptive_name>. Other committers should check
with a topic branch's creator before making any change to it.

=end original

蜊★及戊立永正□反﹜B<yourname>/B<some_descriptive_name> 
及票卞玄疋永弁皮仿件民毛綜嶽允月优邰互丐曰引允﹝
職及戊立永正□反﹜玄疋永弁皮仿件民卞庍凳毛笛尹月蟆卞﹜公及綜嶽樊卞
割カ允月优邰互丐曰引允﹝

=begin original

The simplest way to create a remote topic branch that works on all
versions of git is to push the current head as a new branch on the
remote, then check it out locally:

=end original

允屯化及田□斥亦件及 git 匹⑹綜允月﹜伉乒□玄玄疋永弁皮仿件民毛綜嶽允月
瘉手棵簽卅杅芊反﹜蜇箕及 head 毛伉乒□玄及蕙仄中皮仿件民午仄化皿永扑亙仄﹜
伕□市伙匹民尼永弁失它玄允月仇午匹允﹝

  $ branch="$yourname/$some_descriptive_name"
  $ git push origin HEAD:$branch
  $ git checkout -b $branch origin/$branch

=begin original

Users of git 1.7 or newer can do it in a more obvious manner:

=end original

git 1.7 動嫦及交□扒反﹜手勻午抸日井卅杅芊毛銀丹仇午互請侳引允:

  $ branch="$yourname/$some_descriptive_name"
  $ git checkout -b $branch
  $ git push origin -u $branch

=begin original

If you are not the creator of B<yourname>/B<some_descriptive_name>, you
might sometimes find that the original author has edited the branch's
history. There are lots of good reasons for this. Sometimes, an author
might simply be rebasing the branch onto a newer source point.
Sometimes, an author might have found an error in an early commit which
they wanted to fix before merging the branch to blead.

=end original

B<yourname>/B<some_descriptive_name> 及綜嶽樊匹卅中樺寧﹜葭及綜嶽樊互
皮仿件民及咺昳毛彸螂仄凶仇午卞竣尥仁仇午互丐曰引允﹝
仇木卞反聶仁及懇癲卅咥苀互丐曰引允﹝
樺寧卞方勻化反﹜簽卞皮仿件民毛蕙仄中末□旦禾奶件玄卞湘勿中化
綜曰躂允仇午卞卅月仇午手丐曰引允﹝
樺寧卞方勻化反﹜皮仿件民毛 blead 卞穴□斥允月蟆卞﹜
賡渝及戊立永玄匹膜懇仄凶中巨仿□毛葦勾仃凶仇午手丐曰引允﹝

=begin original

Currently the master repository is configured to forbid
non-fast-forward merges.  This means that the branches within can not
be rebased and pushed as a single step.

=end original

蜇箕﹜穴旦正□伉禾斥玄伉反﹜� fast-forward 及穴□斥毛嗟鞅允月方丹卞
厭嶽今木化中引允﹝
仇木反﹜醱及皮仿件民反伉矛□旦午皿永扑亙毛簽域旦氾永皿午仄化反
匹五卅中仇午毛啦怗仄引允﹝

=begin original

The only way you will ever be allowed to rebase or modify the history
of a pushed branch is to delete it and push it as a new branch under
the same name. Please think carefully about doing this. It may be
better to sequentially rename your branches so that it is easier for
others working with you to cherry-pick their local changes onto the new
version. (XXX: needs explanation).

=end original

皿永扑亙今木凶皮仿件民及咺昳毛瘋潸丿引凶反庍凳允月礿域及杅芊反﹜
公及皮仿件民毛綽輪仄﹜⑺元抩蟆匹蕙仄中皮仿件民午仄化皿永扑亙允月仇午匹允﹝
仇木毛墊丹仇午卞勾中化反艙褐卞腹④仄化仁分今中﹝
職及交□扒□互蕙仄中田□斥亦件卞伕□市伙及庍凳毛棵簽卞
民尼伉□疋永弁匹五月方丹卞﹜
皮仿件民及抩蟆毛賜⺀卞庍凳仄凶杅互方中樺寧互丐曰引允(XXX:濩抸互优邰)﹝

=begin original

If you want to rebase a personal topic branch, you will have to delete
your existing topic branch and push as a new version of it. You can do
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:

=end original

蜊諦讀卅玄疋永弁皮仿件民毛伉矛□旦仄凶中樺寧反﹜
湃繡及玄疋永弁皮仿件民毛綽輪仄﹜蕙仄中田□斥亦件午仄化
皿永扑亙允月优邰互丐曰引允﹝
仇木反﹜皮仿件民毛伉矛□旦仄凶詨﹜慼及跤摯
(擇稱反 git push 妐踏及 C<refspec> 卞楮允月濩抸毛輔寰)匹墊丹仇午互匹五引允﹝

   # 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

=begin original

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:

=end original

B<鏜啦:> 伉禾斥玄伉伊矛伙匹"皿仿奶穴伉"皮仿件民毛綽輪允月仇午反
嗟鞅今木化中引允﹝
仇木反 C<m!^(blead maint perl)!> 卞穴永民件弘允月皮仿件民匹允﹝
綽輪仄方丹午允月午﹜git反慼及方丹卅巨仿□毛戲嶽仄引允:

    $ 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'

=begin original

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
maint-*, we'll fix it in another commit. The only types of updates
allowed on these branches are "fast-forward's", where all history is
preserved.

=end original

禾伉扑□午仄化﹜blead 皮仿件民午 maint-* 皮仿件民及咺昳反彸螂 B<仄引六氏>﹝
正奶皿立旦(引凶反公木動曉)互 blead 引凶反 maint-* 尺及戊立永玄卞
オ太慇氏分樺寧反﹜帎及戊立永玄匹膜懇仄引允﹝
仇木日及皮仿件民匹袱第今木化中月凳蕙及正奶皿反 "fast-forward" 分仃匹﹜
允屯化及咺昳互忡繡今木引允﹝

=begin original

Annotated tags in the canonical perl.git repository will never be
deleted or modified. Think long and hard about whether you want to push
a local tag to perl.git before doing so. (Pushing unannotated tags is
not allowed.)

=end original

伓賞讀卅 perl.git 伉禾斥玄伉〇及鏜澄尥五正弘反﹜綽輪支
庍凳今木月仇午反丐曰引六氏﹝
伕□市伙正弘毛 perl.git 卞皿永扑亙允月蟆卞﹜元勻仁曰嗶尹化心化仁分今中
(鏜澄卅仄正弘及皿永扑亙反袱第今木化中引六氏)﹝

=head1 COMMITTING TO MAINTENANCE VERSIONS

(丟件氾瓜件旦田□斥亦件卞戊立永玄允月)

=begin original

Maintenance versions should only be altered to add critical bug fixes.

=end original

丟件氾瓜件旦田□斥亦件反﹜褐邰卅田弘膜懇毛馨笛允月樺寧卞及心庍凳仄化仁分今中﹝

=begin original

To commit to a maintenance version of perl, you need to create a local
tracking branch:

=end original

perl 及丟件氾瓜件旦田□斥亦件卞戊立永玄允月卞反﹜
伕□市伙馨濘皮仿件民毛綜嶽允月优邰互丐曰引允﹝

  % git checkout --track -b maint-5.005 origin/maint-5.005

=begin original

This creates a local branch named C<maint-5.005>, which tracks the
remote branch C<origin/maint-5.005>. Then you can pull, commit, merge
and push as before.

=end original

仇木卞方曰﹜伉乒□玄皮仿件民 C<origin/maint-5.005> 毛馨濘允月
C<maint-5.005> 午中丹抩蟆及伕□市伙皮仿件民互綜嶽今木引允﹝
慼卞﹜動蟆午⑺元方丹卞皿伙﹜戊立永玄﹜穴□斥﹜皿永扑亙毛墊丹仇午互匹五引允﹝

=begin original

You can also cherry-pick commits from blead and another branch, by
using the C<git cherry-pick> command. It is recommended to use the
B<-x> option to C<git cherry-pick> in order to record the SHA1 of the
original commit in the new commit message.

=end original

C<git cherry-pick> 戊穴件玉毛銀迕仄化﹜blead 午帎及皮仿件民井日
戊立永玄毛民尼伉□疋永弁允月仇午手匹五引允﹝
葭及戊立永玄及 SHA1 毛蕙仄中戊立永玄丟永本□斥卞筏狤允月凶戶卞﹜
C<git cherry-pick> 卞 B<-x> 左皿扑亦件毛銀丹仇午毛換戶引允﹝

=head1 GRAFTS

=begin original

The perl history contains one mistake which was not caught in the
conversion: a merge was recorded in the history between blead and
maint-5.10 where no merge actually occurred.  Due to the nature of git,
this is now impossible to fix in the public repository.  You can remove
this mis-merge locally by adding the following line to your
C<.git/info/grafts> file:

=end original

Perl咺昳卞反﹜庍晶匹腹請今木卅井勻凶貲曰互域勾殖引木化中引允:
blead 午 maint-5.10 及棉及咺昳卞穴□斥互筏狤今木引仄凶互﹜
撢端卞反穴□斥反�戲仄引六氏匹仄凶﹝
git 及嶺撙曉﹜由皮伉永弁伉禾斥玄伉匹膜懇允月仇午反蜇箕尕第チ匹允﹝
C<.git/info/graft> 白央奶伙卞慼及墊毛馨笛允月仇午匹﹜
仇及貲勻凶穴□斥毛伕□市伙匹綽輪匹五引允﹝

  296f12bbbbaa06de9be9d09d3dcf8f4528898a49 434946e0cb7a32589ed92d18008aaa1d88515930

=begin original

It is particularly important to have this graft line if any bisecting
is done in the area of the "merge" in question.

=end original

杽鎖及＞穴□斥＝恄啗匹 bisect 互墊歹木月樺寧﹜仇及 graft 墊毛
隙爛允月仇午互冂卞褐邰匹允﹝

=head1 SEE ALSO

=begin original

The git documentation, accessible via C<git help command>.

=end original

C<git help command> 匹失弁本旦匹五月 git 妐踏﹝

=begin meta

Translate: SHIRAKATA Kentaro <argrath@ub32.org>
Status: completed

=end meta