perlgit.pod

NAME

perlgit - git 縺ｨ Perl 繝ｪ繝昴ず繝医Μ縺ｫ髢｢縺吶ｋ隧ｳ邏ｰ諠��ｱ

DESCRIPTION

縺薙�譁�嶌縺ｯ縲￣erl 繧帝幕逋ｺ縺吶ｋ縺溘ａ縺ｫ git 繧剃ｽｿ縺�ｩｳ邏ｰ繧呈署萓帙＠縺ｾ縺吶�� 蜊倥↓邁｡蜊倥↑繝代ャ繝√↓蟇ｾ縺励※菴懈･ｭ縺吶ｋ縺薙→縺ｫ闊亥袖縺後≠繧九↑繧峨�� 縺ｾ縺� perlhack 繧貞盾辣ｧ縺励※縺上□縺輔＞縲� 縺薙�譁�嶌縺ｯ縲“it 繝ｪ繝昴ず繝医Μ縺ｸ縺ｮ譖ｸ縺崎ｾｼ縺ｿ繧｢繧ｯ繧ｻ繧ｹ繧呈戟縺､莠ｺ縲�ｒ蜷ｫ繧�縲� Perl 縺ｮ螳壽悄逧�↑雋｢迪ｮ閠�〒縺ゅｋ莠ｺ縲��縺溘ａ繧呈э蝗ｳ縺励※縺�∪縺吶��

CLONING THE REPOSITORY

(繝ｪ繝昴ず繝医Μ繧偵け繝ｭ繝ｼ繝ｳ縺吶ｋ)

Perl縺ｮ繧ｽ繝ｼ繧ｹ繧ｳ繝ｼ繝峨�縺吶∋縺ｦ縲�perl5.git.perl.org 縺ｮ Git 繝ｪ繝昴ず繝医Μ縺ｫ 髮�ｸｭ邂｡逅�＆繧後※縺�∪縺吶��

縺薙ｌ繧貞ｮ溯｡後☆繧九％縺ｨ縺ｧ繝ｪ繝昴ず繝医Μ縺ｮ隱ｭ縺ｿ霎ｼ縺ｿ蟆ら畑縺ｮ繧ｯ繝ｭ繝ｼ繝ｳ繧剃ｽ懊ｋ縺薙→縺後〒縺阪∪縺�:

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

縺薙ｌ縺ｯ git 繝励Ο繝医さ繝ｫ (繝昴�繝� 9418) 繧剃ｽｿ縺�∪縺吶��

繝輔ぃ繧､繧｢繧ｦ繧ｩ繝ｼ繝ｫ縺ｮ髢｢菫ゅ〒 git 繝励Ο繝医さ繝ｫ縺御ｽｿ縺医↑縺��ｴ蜷医�� http 邨檎罰縺ｧ繧ゅけ繝ｭ繝ｼ繝ｳ縺ｧ縺阪∪縺吶′縲√�繧九°縺ｫ驕�＞縺ｧ縺�:

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

WORKING WITH THE REPOSITORY

(繝ｪ繝昴ず繝医Μ縺ｧ縺ｮ菴懈･ｭ)

繝ｪ繝昴ず繝医Μ繝�ぅ繝ｬ繧ｯ繝医Μ縺ｫ螟画峩繧貞刈縺医◆繧峨�√◎縺ｮ繝�ぅ繝ｬ繧ｯ繝医Μ繧呈､懈渊縺ｧ縺阪∪縺吶�� 繧ｯ繝ｭ繝ｼ繝ｳ菴懈�蠕後�√Μ繝昴ず繝医Μ縺ｫ縺ｯ蜊倅ｸ�縺ｮ繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√′蜷ｫ縺ｾ繧後∪縺吶�� 縺薙�繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√�縲√い繧ｹ繧ｿ繝ｪ繧ｹ繧ｯ縺ｧ遉ｺ縺輔ｌ縺ｦ縺�ｋ繧医≧縺ｫ縲� 迴ｾ蝨ｨ縺ｮ繝悶Λ繝ｳ繝√↓繧ゅ↑繧翫∪縺吶��

% git branch
* blead

branch 縺ｫ -a 繧ｹ繧､繝�メ繧剃ｽｿ逕ｨ縺吶ｋ縺ｨ縲√Μ繝昴ず繝医Μ蜀�� 繝ｪ繝｢繝ｼ繝郁ｿｽ霍｡繝悶Λ繝ｳ繝√ｂ陦ｨ遉ｺ縺輔ｌ縺ｾ縺�:

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

"origin" 縺ｧ蟋九∪繧九ヶ繝ｩ繝ｳ繝√�縲√け繝ｭ繝ｼ繝ｳ蜈�� "git remote" ("origin" 縺ｨ縺�≧蜷榊燕) 縺ｫ蟇ｾ蠢懊＠縺ｾ縺吶�� 繝ｪ繝｢繝ｼ繝医�蜷�ヶ繝ｩ繝ｳ繝√�縲√％繧後ｉ縺ｮ繝悶Λ繝ｳ繝√↓繧医▲縺ｦ豁｣遒ｺ縺ｫ霑ｽ霍｡縺輔ｌ縺ｾ縺吶�� 縺薙ｌ繧峨�繝ｪ繝｢繝ｼ繝郁ｿｽ霍｡繝悶Λ繝ｳ繝√〒縺ｯ邨ｶ蟇ｾ縺ｫ菴懈･ｭ縺励↑縺�〒縺上□縺輔＞縲� 繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√〒縺ｮ縺ｿ菴懈･ｭ縺励∪縺吶�� 繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√�縲∵欠螳壹＆繧後◆繝ｪ繝｢繝ｼ繝郁ｿｽ霍｡繝悶Λ繝ｳ繝√°繧� (繝励Ν譎ゅ↓)閾ｪ蜍輔�繝ｼ繧ｸ縺吶ｋ繧医≧縺ｫ讒区�縺ｧ縺阪∪縺吶�� 縺薙ｌ縺ｯ縲√Μ繝｢繝ｼ繝郁ｿｽ霍｡繝悶Λ繝ｳ繝� origin/blead 縺九ｉ繝槭�繧ｸ縺吶ｋ繧医≧縺ｫ 讒区�縺輔ｌ縺ｦ縺�ｋ繝�ヵ繧ｩ繝ｫ繝医ヶ繝ｩ繝ｳ繝� blead 縺ｮ蝣ｴ蜷医〒縺吶��

譛�霑代�繧ｳ繝溘ャ繝医ｒ隕九ｉ繧後∪縺�:

% git log

繝ｪ繝昴ず繝医Μ縺九ｉ譁ｰ縺励＞螟画峩繧偵�繝ｫ縺励�√Ο繝ｼ繧ｫ繝ｫ繝ｪ繝昴ず繝医Μ繧呈峩譁ｰ縺励∪縺� (譛�蛻昴↓繧ｯ繝ｪ繝ｼ繝ｳ縺ｫ縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺�)縲�

% git pull

繝励Ν縺ｮ逶ｴ蠕後↓繝悶Λ繝ｳ繝� blead 縺ｫ縺�ｋ縺ｨ莉ｮ螳壹☆繧九→縲√％縺ｮ繧ｳ繝槭Φ繝峨� 莉･荳九→縺ｻ縺ｼ遲我ｾ｡縺ｫ縺ｪ繧翫∪縺�:

% git fetch
% git merge origin/blead

螳滄圀縲∽ｽ懈･ｭ繝�ぅ繝ｬ繧ｯ繝医Μ縺ｫ繧｢繧ｯ繧ｻ繧ｹ縺帙★縺ｫ繝ｭ繝ｼ繧ｫ繝ｫ繝ｪ繝昴ず繝医Μ繧呈峩譁ｰ縺励◆縺��ｴ蜷医�縲� 谺｡縺ｮ繧医≧縺ｫ縺励∪縺�:

% git fetch

縺ｾ縺溘�∝ｮ夂ｾｩ縺輔ｌ縺溘☆縺ｹ縺ｦ縺ｮ繝ｪ繝｢繝ｼ繝医↓蟇ｾ縺励※繝ｪ繝｢繝ｼ繝郁ｿｽ霍｡繝悶Λ繝ｳ繝√ｒ 蜷梧凾縺ｫ譖ｴ譁ｰ縺励◆縺��ｴ蜷医�縲∽ｻ･荳九�繧医≧縺ｫ陦後≧縺薙→縺後〒縺阪∪縺�:

% git remote update

譛�蠕後�莠後▽縺ｮ繧ｳ繝槭Φ繝峨�縺ｩ縺｡繧峨ｂ菴懈･ｭ繝�ぅ繝ｬ繧ｯ繝医Μ繧呈峩譁ｰ縺励∪縺帙ｓ縺後�√←縺｡繧峨ｂ 繝ｪ繝昴ず繝医Μ蜀��繝ｪ繝｢繝ｼ繝郁ｿｽ霍｡繝悶Λ繝ｳ繝√ｒ譖ｴ譁ｰ縺励∪縺吶��

繝ｪ繝｢繝ｼ繝医ヶ繝ｩ繝ｳ繝√�繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√ｒ菴懊ｋ縺ｫ縺ｯ:

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

blead 縺ｫ謌ｻ繧九↓縺ｯ:

% git checkout blead

Finding out your status

(迴ｾ蝨ｨ縺ｮ迥ｶ諷九ｒ遒ｺ隱阪☆繧�)

縺翫◎繧峨￥繧ゅ▲縺ｨ繧ゅｈ縺丈ｽｿ縺� git 繧ｳ繝槭Φ繝峨�:

% git status

縺薙�繧ｳ繝槭Φ繝峨�縲∝､画峩縺輔ｌ縺溘ヵ繧｡繧､繝ｫ繧�┌隕悶＆繧後※縺�↑縺� 霑ｽ霍｡縺輔ｌ縺ｦ縺�↑縺�ヵ繧｡繧､繝ｫ縺ｪ縺ｩ縲√Μ繝昴ず繝医Μ縺ｮ迴ｾ蝨ｨ縺ｮ迥ｶ諷九�隱ｬ譏弱ｒ 蜃ｺ蜉帙→縺励※逕滓�縺励∪縺吶�� 縺輔ｉ縺ｫ縲∵ｬ｡縺ｮ繧ｳ繝溘ャ繝医�縺溘ａ縺ｫ繧ｹ繝��繧ｸ繝ｳ繧ｰ縺輔ｌ縺溘ヵ繧｡繧､繝ｫ繧��� 騾壼ｸｸ縺ｯ螟画峩譁ｹ豕輔↓髢｢縺吶ｋ譛臥畑縺ｪ諠��ｱ繧定｡ｨ遉ｺ縺励∪縺吶�� 縺溘→縺医�縲∵ｬ｡縺ｮ繧医≧縺ｫ縺ｪ繧翫∪縺�:

% 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/perlgit.pod

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working
                                                             directory)

      modified:   pod/perlgit.pod

Untracked files:
  (use "git add <file>..." to include in what will be committed)

      deliberate.untracked

縺薙ｌ縺ｯ縲√さ繝溘ャ繝医�縺溘ａ縺ｫ繧ｹ繝��繧ｸ繝ｳ繧ｰ縺輔ｌ縺溘％縺ｮ譁�嶌縺ｫ螟画峩縺後≠縺｣縺溘％縺ｨ縺ｨ縲� 縺ｾ縺�繧ｹ繝��繧ｸ繝ｳ繧ｰ縺輔ｌ縺ｦ縺�↑縺�Ρ繝ｼ繧ｭ繝ｳ繧ｰ繝�ぅ繝ｬ繧ｯ繝医Μ縺ｫ 縺輔ｉ縺ｫ螟画峩縺後≠縺｣縺溘％縺ｨ繧堤､ｺ縺励※縺�∪縺吶�� 縺ｾ縺溘�√Ρ繝ｼ繧ｭ繝ｳ繧ｰ繝�ぅ繝ｬ繧ｯ繝医Μ縺ｫ霑ｽ霍｡縺輔ｌ縺ｦ縺�↑縺�ヵ繧｡繧､繝ｫ縺� 縺ゅ▲縺溘％縺ｨ繧ら､ｺ縺励※縺�∪縺�; 縺ｾ縺溘�√％繧後ｉ縺吶∋縺ｦ繧貞､画峩縺吶ｋ譁ｹ豕輔ｒ遉ｺ縺励※縺�∪縺吶�� 縺ｾ縺溘��origin 繝ｪ繝｢繝ｼ繝医↓縺ｾ縺�繝励ャ繧ｷ繝･縺輔ｌ縺ｦ縺�↑縺�Ρ繝ｼ繧ｭ繝ｳ繧ｰ繝悶Λ繝ｳ繝� blead 縺ｫ荳�縺､縺ｮ繧ｳ繝溘ャ繝医′縺ゅｋ縺薙→繧ら､ｺ縺励※縺�∪縺吶�� 豕ｨ: 縺薙�蜃ｺ蜉帙�縲�git commit 縺ｫ繝｡繝�そ繝ｼ繧ｸ繧呈署萓帙＠縺ｪ縺��ｴ蜷医↓ 繝�Φ繝励Ξ繝ｼ繝医→縺励※陦ｨ遉ｺ縺輔ｌ繧九ｂ縺ｮ縺ｧ繧ゅ≠繧翫∪縺吶��

Patch workflow

(繝代ャ繝√�繝ｯ繝ｼ繧ｯ繝輔Ο繝ｼ)

縺ｾ縺壹�￣erl 繧ｳ繧｢繧偵ワ繝�け縺吶ｋ縺溘ａ縺ｮ隧ｳ邏ｰ縺ｫ縺､縺�※縺ｯ perlhack 繧定ｪｭ繧薙〒縺上□縺輔＞縲� 縺薙�譁�嶌縺ｯ繧医＞繝代ャ繝√�菴懊ｊ譁ｹ縺ｫ髢｢縺吶ｋ螟壹￥縺ｮ隧ｳ邏ｰ縺ｫ蟇ｾ蠢懊＠縺ｦ縺�∪縺吶��

縺吶〒縺ｫ Perl 繝ｪ繝昴ず繝医Μ繧呈戟縺｣縺ｦ縺�ｋ蝣ｴ蜷医�縲� blead 繝悶Λ繝ｳ繝√↓縺�※縲√Μ繝昴ず繝医Μ縺梧怙譁ｰ縺ｧ縺ゅｋ縺薙→繧堤｢ｺ隱阪☆繧句ｿ�ｦ√′縺ゅｊ縺ｾ縺�:

% git checkout blead
% git pull

譛�譁ｰ縺ｮ blead 繝舌�繧ｸ繝ｧ繝ｳ縺ｫ蟇ｾ縺励※繝代ャ繝√ｒ驕ｩ逕ｨ縺吶ｋ縺薙→繧偵♀蜍ｧ繧√＠縺ｾ縺吶�� 縺薙ｌ縺ｯ縲�㍾螟ｧ縺ｪ繝舌げ菫ｮ豁｣莉･螟悶�縺吶∋縺ｦ縺ｮ螟画峩縺ｫ蟇ｾ縺励※譁ｰ縺溘↑髢狗匱縺瑚｡後ｏ繧後ｋ 蝣ｴ謇�縺ｧ縺ゅｋ縺溘ａ縺ｧ縺吶�� 驥榊､ｧ縺ｪ繝舌げ菫ｮ豁｣繝代ャ繝√�縲�未騾｣縺吶ｋ繝｡繧､繝ｳ繝悶Λ繝ｳ繝√↓蟇ｾ縺励※菴懈�縺吶ｋ縺九�� 菫ｮ豁｣縺碁←逕ｨ縺輔ｌ繧九☆縺ｹ縺ｦ縺ｮ繝悶Λ繝ｳ繝√ｒ遉ｺ縺吶Γ繝｢縺ｨ縺ｨ繧ゅ↓謠仙�縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺吶��

縺吶∋縺ｦ縺梧怙譁ｰ縺ｮ迥ｶ諷九↓縺ｪ縺｣縺溘�縺ｧ縲√％繧後ｉ縺ｮ螟画峩縺ｫ蟇ｾ縺励※荳�譎ら噪縺ｪ 譁ｰ縺励＞繝悶Λ繝ｳ繝√ｒ菴懈�縺励�√◎縺ｮ繝悶Λ繝ｳ繝√↓蛻�ｊ譖ｿ縺医ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺�:

% git checkout -b orange

縺薙ｌ縺ｯ莉･荳九�繧ゅ�縺ｮ遏ｭ邵ｮ蠖｢縺ｧ縺�

% git branch orange
% git checkout orange

繝医ヴ繝�け繝悶Λ繝ｳ繝√ｒ菴懈�縺吶ｋ縺薙→縺ｧ縲√Γ繝ｳ繝�リ縺ｯ繧医ｊ繝ｪ繝九い縺ｪ螻･豁ｴ縺ｮ縺溘ａ縺ｫ master blead 縺ｫ繝ｪ繝吶�繧ｹ縺ｾ縺溘�繝槭�繧ｸ繝舌ャ繧ｯ縺吶ｋ縺薙→縺檎ｰ｡蜊倥↓縺ｪ繧翫∪縺吶�� 繝医ヴ繝�け繝悶Λ繝ｳ繝√〒菴懈･ｭ縺励↑縺��ｴ蜷医�� 繝｡繝ｳ繝�リ縺ｯ螟画峩繧帝←逕ｨ縺吶ｋ蜑阪↓謇句虚縺ｧ blead 縺ｫ繝√ぉ繝ｪ繝ｼ繝斐ャ繧ｯ縺吶ｋ 蠢�ｦ√′縺ゅｊ縺ｾ縺吶��

perl5-porters 縺ｧ蜿ｱ繧峨ｌ繧九％縺ｨ縺ｫ縺ｪ繧九�縺ｧ縲√◎繧薙↑縺薙→縺ｯ縺励↑縺�〒縺上□縺輔＞縲� 縺�∪縺上ｄ繧翫∪縺励ｇ縺���

谺｡縺ｫ縲∝､画峩繧貞刈縺医∪縺吶�� 縺溘→縺医�縲´eon Brocard 縺悟錐蜑阪ｒ Orange Brocard 縺ｫ螟画峩縺励◆蝣ｴ蜷医�� AUTHORS 繝輔ぃ繧､繝ｫ蜀��蜷榊燕繧貞､画峩縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺�:

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

縺ｩ縺ｮ繝輔ぃ繧､繝ｫ繧貞､画峩縺励◆縺九ｒ隕九ｉ繧後∪縺�:

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

   modified:   AUTHORS

縺昴＠縺ｦ螟画峩縺瑚ｦ九ｉ繧後∪縺�:

% 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>

縺薙％縺ｧ螟画峩繧偵Ο繝ｼ繧ｫ繝ｫ縺ｫ繧ｳ繝溘ャ繝医＠縺ｾ縺�:

% 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(-)

-a 繧ｪ繝励す繝ｧ繝ｳ縺ｯ縲“it 縺瑚ｿｽ霍｡縺励※縺�ｋ繝輔ぃ繧､繝ｫ縺ｮ荳ｭ縺ｧ縺ゅ↑縺溘′螟画峩縺励◆ 蜈ｨ縺ｦ縺ｮ繝輔ぃ繧､繝ｫ繧貞性繧�縺溘ａ縺ｫ菴ｿ繧上ｌ縺ｾ縺吶�� 繧ゅ＠縺薙�譎らせ縺ｧ縲∽ｽ懈･ｭ縺励◆繝輔ぃ繧､繝ｫ縺ｮ荳�驛ｨ縺�縺代ｒ繧ｳ繝溘ャ繝医＠縺溘＞蝣ｴ蜷医�縲� -a 繧堤怐逡･縺励※縲√さ繝溘ャ繝医ｒ陦後≧蜑阪↓繧ｳ繝槭Φ繝� git add FILE ... 繧剃ｽｿ縺｣縺ｦ縺上□縺輔＞縲� git add --interactive 縺ｯ縲√ヵ繧｡繧､繝ｫ荳ｭ縺ｮ蜈ｨ縺ｦ縺ｮ螟画峩縺ｧ縺ｯ縺ｪ縺上�� 繝輔ぃ繧､繝ｫ縺ｮ荳�驛ｨ繧偵さ繝溘ャ繝医〒縺阪ｋ繧医≧縺ｫ縺励∪縺吶��

-m 繧ｪ繝励す繝ｧ繝ｳ縺ｯ繧ｳ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ繧呈欠螳壹☆繧九◆繧√↓菴ｿ繧上ｌ縺ｾ縺吶�� 縺薙ｌ繧堤怐逡･縺吶ｋ縺ｨ縲“it 縺ｯ繝｡繝�そ繝ｼ繧ｸ繧貞ｯｾ隧ｱ逧�↓菴懈�縺吶ｋ縺溘ａ縺ｫ 繝�く繧ｹ繝医お繝�ぅ繧ｿ繧帝幕縺阪∪縺吶�� 縺薙ｌ縺ｯ縲∝､画峩縺後％縺薙〒謖�ｮ壹☆繧九し繝ｳ繝励Ν繧医ｊ繧り､�尅縺ｪ蝣ｴ蜷医�√◎縺励※ 繧ｨ繝�ぅ繧ｿ縺ｫ繧医▲縺ｦ縺ｯ縲√さ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ縺ｮ蜈磯�ｭ陦後′荳企剞縺ｮ 50 譁�ｭ励ｒ雜�∴縺ｪ縺�％縺ｨ繧堤衍繧九◆繧√↓譛臥畑縺ｧ縺吶��

繧ｳ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ繧呈嶌縺咲ｵゅ∴縺ｦ繧ｨ繝�ぅ繧ｿ繧堤ｵゆｺ�☆繧九→縲� git 縺ｯ螟画峩繧偵ョ繧｣繧ｹ繧ｯ縺ｫ譖ｸ縺崎ｾｼ縺ｿ縲∽ｻ･荳九�繧医≧縺ｪ繝｡繝�そ繝ｼ繧ｸ繧貞�蜉帙＠縺ｾ縺�:

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

git status 繧貞�螳溯｡後☆繧九→縲∵ｬ｡縺ｮ繧医≧縺ｪ繧ゅ�縺瑚｡ｨ遉ｺ縺輔ｌ縺ｾ縺�:

% git status
On branch orange
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)

逍代ｏ縺励＞縺ｨ縺阪↓縺ｯ縲∽ｻ悶�縺薙→繧偵☆繧句燕縺ｫ縲√せ繝��繧ｿ繧ｹ繧偵メ繧ｧ繝�け縺励※ 豕ｨ諢乗ｷｱ縺剰ｪｭ繧薙〒縺上□縺輔＞; 螟壹￥縺ｮ逍大撫縺ｯ git status 縺ｮ蜃ｺ蜉帙〒逶ｴ謗･蠢懊∴繧峨ｌ縺ｦ縺�∪縺吶��

譛�蠕後�繧ｳ繝溘ャ繝医ｒ莉･荳九�繧医≧縺ｫ縺励※讀懈渊縺ｧ縺阪∪縺�:

% git show HEAD

隱ｬ譏弱∪縺溘�繝代ャ繝∬�菴薙↓貅�雜ｳ縺ｧ縺阪↑縺��ｴ蜷医�縲√ヵ繧｡繧､繝ｫ繧偵ｂ縺�ｸ�蠎ｦ邱ｨ髮�＠縺ｦ縺九ｉ 谺｡縺ｮ繧ｳ繝槭Φ繝峨ｒ逋ｺ陦後☆繧九％縺ｨ縺ｧ菫ｮ豁｣縺ｧ縺阪∪縺�:

% git commit -a --amend

縺薙％縺ｧ蜈ｨ縺ｦ縺ｮ繝ｭ繝ｼ繧ｫ繝ｫ縺ｪ螟画峩縺ｮ縺溘ａ縺ｮ繝代ャ繝√ヵ繧｡繧､繝ｫ繧剃ｽ懊ｋ縺ｹ縺阪〒縺�:

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

縺ゅｋ縺��螟画峩縺悟､壹＞蝣ｴ蜷医�√▽縺ｾ繧翫ヨ繝斐ャ繧ｯ繝悶Λ繝ｳ繝√°繧峨�:

% git format-patch --stdout -M blead.. > topic-branch-changes.patch

perlbug@perl.org 螳帙↓螟画峩蜀�ｮｹ繧定ｨ倩ｼ峨＠縺� 繝｡繝ｼ繝ｫ繧帝�∽ｿ｡縺励�√％縺ｮ繝代ャ繝√ヵ繧｡繧､繝ｫ繧呈ｷｻ莉倥ヵ繧｡繧､繝ｫ縺ｨ縺励※騾√▲縺ｦ縺上□縺輔＞縲� RT 縺ｧ霑ｽ霍｡縺吶ｋ縺薙→縺ｫ蜉�縺医※縲� perlbug 縺ｫ繝｡繝ｼ繝ｫ縺吶ｋ縺ｨ縲∬�蜍慕噪縺ｫ perl5-porters 縺ｫ (謇句虚縺ｮ繝｢繝�Ξ繝ｼ繧ｷ繝ｧ繝ｳ縺ｮ蠕後�∝ｾ薙▲縺ｦ豌鈴聞縺ｫ蠕�▲縺ｦ縺上□縺輔＞) 霆｢騾√＆繧後∪縺吶�� 繝代ャ繝√�驕ｩ逕ｨ縺吶ｋ貅門ｙ縺後〒縺阪※縺�↑縺�憾諷九□縺代ｌ縺ｩ繧りｭｰ隲悶＠縺溘＞蝣ｴ蜷医�縲� perl5-porters@perl.org 縺�縺代↓ 逶ｴ謗･繝｡繝ｼ繝ｫ繧帝�√ｋ縺ｹ縺阪〒縺吶��

繝代ャ繝√ｒ騾√ｋ縺ｮ縺ｫ git-send-email(1) 繧剃ｽｿ繧上↑縺�〒縺上□縺輔＞縲� 縺輔ｉ縺ｪ繧区ュ蝣ｱ縺ｫ縺､縺�※縺ｯ Sending patch emails 繧貞盾辣ｧ縺励※縺上□縺輔＞縲�

荳�譎ら噪縺ｪ繝悶Λ繝ｳ繝√ｒ蜑企勁縺励◆縺�↑繧峨�∽ｻ･荳九�繧医≧縺ｫ縺ｧ縺阪∪縺�:

% 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.

Committing your changes

(螟画峩繧偵さ繝溘ャ繝医☆繧�)

莉願｡後▲縺溘☆縺ｹ縺ｦ縺ｮ螟画峩繧剃ｸ�縺､縺ｮ繧｢繝医Α繝�け繝ｦ繝九ャ繝医→縺励※繧ｳ繝溘ャ繝医＠縺溘＞蝣ｴ蜷医�縲� 谺｡縺ｮ繧ｳ繝槭Φ繝峨ｒ螳溯｡後＠縺ｾ縺�:

% git commit -a

(-a 縺ｯ git 縺ｫ蟇ｾ縺励※縲∝､画峩縺励◆縺吶∋縺ｦ縺ｮ繝輔ぃ繧､繝ｫ繧偵％縺ｮ繧ｳ繝溘ャ繝医↓ 霑ｽ蜉�縺吶ｋ繧医≧縺ｫ謖�､ｺ縺励∪縺吶�� commit -a 繧剃ｽｿ逕ｨ縺励※繧ゅ�∵眠縺励＞繝輔ぃ繧､繝ｫ縺ｯ閾ｪ蜍慕噪縺ｫ繧ｳ繝溘ャ繝医↓霑ｽ蜉�縺輔ｌ縺ｾ縺帙ｓ縲� 繝輔ぃ繧､繝ｫ繧定ｿｽ蜉�縺励◆縺��ｴ蜷医ｄ縲∽ｸ�驛ｨ縺ｮ螟画峩繧偵さ繝溘ャ繝医＠縺溘＞蝣ｴ蜷医�縲� git add 縺ｮ譁�嶌繧貞盾辣ｧ縺励※縺上□縺輔＞縲�

Git 縺ｯ縲√≠縺ｪ縺溘′螟画峩蜀�ｮｹ縺ｮ繧ｳ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ繧剃ｽ懈�縺ｧ縺阪ｋ繧医≧縺ｫ縲� 縺頑ｰ励↓蜈･繧翫�繝�く繧ｹ繝医お繝�ぅ繧ｿ繧定ｵｷ蜍輔＠縺ｾ縺吶�� 驕ｩ蛻�↑繧ｳ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ繧剃ｽ懈�縺吶ｋ譁ｹ豕輔↓髢｢縺吶ｋ縺輔ｉ縺ｪ繧区ュ蝣ｱ縺ｫ縺､縺�※縺ｯ縲� "Commit message" 繧貞盾辣ｧ縺励※縺上□縺輔＞縲�

繧ｳ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ繧呈嶌縺咲ｵゅ∴縺ｦ繧ｨ繝�ぅ繧ｿ繧堤ｵゆｺ�☆繧九→縲� git 縺ｯ螟画峩繧偵ョ繧｣繧ｹ繧ｯ縺ｫ譖ｸ縺崎ｾｼ縺ｿ縲∽ｻ･荳九�繧医≧縺ｪ繝｡繝�そ繝ｼ繧ｸ繧貞�蜉帙＠縺ｾ縺�:

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

git status 繧貞�螳溯｡後☆繧九→縲∵ｬ｡縺ｮ繧医≧縺ｪ繧ゅ�縺瑚｡ｨ遉ｺ縺輔ｌ縺ｾ縺�:

% git status
On branch blead
Your branch is ahead of 'origin/blead' by 2 commits.
  (use "git push" to publish your local 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)

菴輔°逍大撫縺後≠繧句�ｴ蜷医↓縺ｯ縲∽ｽ輔°繧偵☆繧句燕縺ｫ閾ｪ蛻��繧ｹ繝��繧ｿ繧ｹ繧偵メ繧ｧ繝�け縺励※ 豕ｨ諢乗ｷｱ縺剰ｪｭ繧薙〒縺上□縺輔＞; 螟壹￥縺ｮ逍大撫縺ｫ蟇ｾ縺励※縺ｯ縲“it status 蜃ｺ蜉帙′逶ｴ謗･遲斐∴縺ｦ縺上ｌ縺ｾ縺吶��

Sending patch emails

(繝代ャ繝√ｒ繝｡繝ｼ繝ｫ縺吶ｋ)

繝代ャ繝√ｒ菴懊▲縺溘ｉ縲� (蜑阪�遽� 縺ｧ隴ｰ隲悶＠縺溘ｈ縺�↓) 縺昴ｌ繧呈ｷｻ莉倥ヵ繧｡繧､繝ｫ縺ｫ縺励※縲√ヱ繝�メ縺ｮ隱ｬ譏弱→蜈ｱ縺ｫ縲� 騾壼ｸｸ縺ｮ繝｡繝ｼ繝ｫ繧ｯ繝ｩ繧､繧｢繝ｳ繝医〒 perlbug@perl.org 縺ｫ騾√▲縺ｦ縺上□縺輔＞縲�

git-format-patch(1) 縺ｧ逕滓�縺励◆繝代ャ繝√ｒ騾√ｋ縺ｮ縺ｫ git-send-email(1) 繧� 菴ｿ縺｣縺ｦ縺ｯ 縺�￠縺ｾ縺帙ｓ縲� perlbug@perl.org 縺ｮ蠕後ｍ縺ｧ蜍輔＞縺ｦ縺�ｋ RT 繝√こ繝�ヨ繧ｷ繧ｹ繝�Β縺ｯ縲� 髮ｻ蟄舌Γ繝ｼ繝ｫ縺ｮ繧､繝ｳ繝ｩ繧､繝ｳ繧ｳ繝ｳ繝�Φ繝�ｒ隱崎ｭ倥＠縺ｪ縺��縺ｧ縲� RT 縺ｫ繧､繝ｳ繝ｩ繧､繝ｳ縺ｧ繝代ャ繝√ｒ騾√ｋ縺ｨ縲√ヱ繝�メ縺ｯ遐ｴ螢翫＆繧後∪縺吶��

隱ｰ縺九′ RT 縺九ｉ繝代ャ繝√ｒ繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨☆繧九→縲�｡悟錐 (繧ｳ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ縺ｮ 譛�蛻昴�陦�) 縺ｯ蜑企勁縺輔ｌ縺ｾ縺吶�� 萓九∴縺ｰ RT #74192 縺ｨ 繧ｳ繝溘ャ繝� a4583001 繧貞盾辣ｧ縺励※縺上□縺輔＞縲� 縺ゅｋ縺��縲∬ｪｰ縺九′繝｡繝ｼ繝ｫ繝懊ャ繧ｯ繧ｹ縺ｫ螻翫＞縺� RT 縺九ｉ縺ｮ繝代ャ繝√ｒ 驕ｩ逕ｨ縺吶ｋ縺九ｂ縺励ｌ縺ｾ縺帙ｓ; 縺薙�蝣ｴ蜷� RT 縺ｯ繝｡繝�そ繝ｼ繧ｸ縺ｮ繧､繝ｳ繝ｩ繧､繝ｳ繧ｳ繝ｳ繝�Φ繝�ｒ 螟画峩縺励※縺�∪縺吶�� 縺薙�螟ｱ謨励↓髢｢縺吶ｋ謔ｪ縺�ｾ九� RT #74532 縺ｨ繧ｳ繝溘ャ繝� f9bcfeac 繧貞盾辣ｧ縺励※縺上□縺輔＞縲�

A note on derived files

(豢ｾ逕溘ヵ繧｡繧､繝ｫ縺ｫ髢｢縺吶ｋ豕ｨ諢�)

繝�ぅ繧ｹ繝医Μ繝薙Η繝ｼ繧ｷ繝ｧ繝ｳ蜀��螟壹￥縺ｮ繝輔ぃ繧､繝ｫ縺ｯ 豢ｾ逕溽噪縺ｪ繧ゅ�縺ｧ縺ゅｋ縺薙→縺ｫ豕ｨ諢上＠縺ｦ縺上□縺輔＞ -- 縺昴ｌ繧峨�繝輔ぃ繧､繝ｫ縺ｫ繝代ャ繝√ｒ蠖薙※繧九％縺ｨ縺ｯ驕ｿ縺代※縺上□縺輔＞; 縺ｪ縺懊↑繧峨�“it 縺ｯ縺昴ｌ繧峨↓蟇ｾ縺吶ｋ螟画峩繧定ｦ九ｋ縺薙→縺後〒縺阪★縲� 繝薙Ν繝峨�繝ｭ繧ｻ繧ｹ縺後◎繧後ｉ繧剃ｸ頑嶌縺阪☆繧九°繧峨〒縺吶�� 莉｣繧上ｊ縺ｫ繧ｪ繝ｪ繧ｸ繝翫Ν縺ｫ繝代ャ繝√ｒ蠖薙※縺ｦ縺上□縺輔＞縲� 縺ｻ縺ｨ繧薙←縺ｮ繝ｦ繝ｼ繝�ぅ繝ｪ繝�ぅ(perldoc 縺ｪ縺ｩ)縺ｯ縺薙�繧ｫ繝�ざ繝ｪ縺ｫ縺ゅｊ縺ｾ縺�; 縺吶↑繧上■縲「tils/perldoc 縺ｧ縺ｯ縺ｪ縺� utils/perldoc.PL 縺ｫ繝代ャ繝√ｒ蠖薙※縺ｾ縺吶�� 蜷梧ｧ倥↓縲�$install_root/lib 縺ｫ縺ゅｋ繧ｳ繝斐�縺九ｉ $src_root/ext 莉･荳九�繝輔ぃ繧､繝ｫ縺ｫ 繝代ャ繝√ｒ菴懈�縺励↑縺�〒縺上□縺輔＞縲� 繧ｽ繝ｼ繧ｹ繝�ぅ繧ｹ繝医Μ繝薙Η繝ｼ繧ｷ繝ｧ繝ｳ縺ｮ繝薙Ν繝我ｸｭ縺ｫ繧ｳ繝斐�縺輔ｌ縺溷庄閭ｽ諤ｧ縺ｮ縺ゅｋ繝輔ぃ繧､繝ｫ縺ｮ 驕ｩ蛻�↑蝣ｴ謇�縺後ｏ縺九ｉ縺ｪ縺��ｴ蜷医�縲�MANIFEST 繧定ｪｿ縺ｹ縺ｦ縺上□縺輔＞縲�

Cleaning a working directory

(菴懈･ｭ繝�ぅ繝ｬ繧ｯ繝医Μ繧呈祉髯､縺吶ｋ)

git clean 繧ｳ繝槭Φ繝峨�縺輔∪縺悶∪縺ｪ蠑墓焚縺ｧ make clean 縺ｮ莉｣繧上ｊ縺ｫ 菴ｿ縺�％縺ｨ縺後〒縺阪∪縺吶��

菴懈･ｭ繝�ぅ繝ｬ繧ｯ繝医Μ繧貞�譛溽憾諷九↓繝ｪ繧ｻ繝�ヨ縺吶ｋ縺ｫ縺ｯ縲∵ｬ｡縺ｮ繧医≧縺ｫ縺励∪縺�:

% git clean -dxf

縺溘□縺励�√％繧後↓繧医ｊ縺吶∋縺ｦ縺ｮ霑ｽ霍｡縺輔ｌ縺ｦ縺�↑縺�さ繝ｳ繝�Φ繝�′蜑企勁縺輔ｌ縺ｾ縺吶�� 谺｡縺ｮ繧医≧縺ｫ縺吶ｋ縺ｨ:

% git clean -Xf

繝薙Ν繝峨ｄ繝�せ繝医�蜑ｯ逕｣迚ｩ縺ｪ縺ｩ縲√☆縺ｹ縺ｦ縺ｮ辟｡隕悶＆繧後◆ 霑ｽ霍｡縺輔ｌ縺ｦ縺�↑縺�ヵ繧｡繧､繝ｫ繧貞炎髯､縺励∪縺吶�� 縺溘□縺励�∵焔蜍輔〒菴懈�縺励◆繝輔ぃ繧､繝ｫ縺ｯ谿九＠縺ｾ縺吶��

繧ｳ繝溘ャ繝医＆繧後※縺�↑縺�ｷｨ髮�□縺代ｒ繧ｭ繝｣繝ｳ繧ｻ繝ｫ縺励◆縺��ｴ蜷医�縲� git checkout 繧剃ｽｿ逕ｨ縺励※蜈�↓謌ｻ縺吶ヵ繧｡繧､繝ｫ縺ｮ繝ｪ繧ｹ繝医ｒ荳弱∴繧九°縲� git checkout -f 繧剃ｽｿ逕ｨ縺励※縺吶∋縺ｦ繧貞�縺ｫ謌ｻ縺吶％縺ｨ縺後〒縺阪∪縺吶��

1縺､縺ｾ縺溘�隍�焚縺ｮ繧ｳ繝溘ャ繝医ｒ繧ｭ繝｣繝ｳ繧ｻ繝ｫ縺励◆縺��ｴ蜷医�縲�git reset 繧� 菴ｿ縺�％縺ｨ縺後〒縺阪∪縺吶��

Bisecting

(bisect)

git 縺ｯ縲∵欠螳壹＆繧後◆繝舌げ縺悟ｰ主�縺輔ｌ縺溘�縺後←縺ｮ繧ｳ繝溘ャ繝医↓雋ｬ莉ｻ縺後≠繧九°繧� 豎ｺ螳壹☆繧狗ｵ�∩霎ｼ縺ｿ縺ｮ謇区ｮｵ繧呈署萓帙＠縺ｦ縺�∪縺吶�� git bisect 縺ｯ螟ｱ謨励☆繧区怙蛻昴�繧ｳ繝溘ャ繝医ｒ迚ｹ螳壹☆繧九◆繧√↓ 螻･豁ｴ縺ｮ莠悟�讀懃ｴ｢繧定｡後＞縺ｾ縺吶�� 縺薙ｌ縺ｯ鬮倬�溘〒蠑ｷ蜉帙〒譟碑ｻ滓�ｧ縺後≠繧翫∪縺吶′縲∝､壼ｰ代�貅門ｙ縺悟ｿ�ｦ√〒縲� 蜃ｦ逅�ｒ閾ｪ蜍募喧縺吶ｋ縺ｫ縺ｯ螟夜Κ繧ｷ繧ｧ繝ｫ繧ｹ繧ｯ繝ｪ繝励ヨ縺悟ｿ�ｦ√〒縺吶��

繧ｳ繧｢縺ｯ繝ｩ繝�ヱ繝励Ο繧ｰ繝ｩ繝�縺ｧ縺ゅｋ Porting/bisect.pl 繧呈署萓帙＠縺ｦ縺�∪縺�; 縺薙ｌ縺ｯ縺ｧ縺阪ｋ縺�縺台ｽ懈･ｭ繧貞腰邏泌喧縺励※縲� Perl 縺ｮ繝ｯ繝ｳ繝ｩ繧､繝翫�繧貞ｮ溯｡後☆繧九□縺代〒 bisect 縺後〒縺阪ｋ繧医≧縺ｫ縺励∪縺吶�� 萓九∴縺ｰ縲∵ｬ｡縺ｮ繧ゅ�縺後＞縺､繧ｨ繝ｩ繝ｼ縺ｫ縺ｪ縺｣縺溘°繧堤衍繧翫◆縺��ｴ蜷�:

perl -e 'my $a := 2'

蜊倡ｴ斐↓縺薙ｌ繧貞ｮ溯｡後＠縺ｾ縺�:

.../Porting/bisect.pl -e 'my $a := 2;'

Porting/bisect.pl 繧� (莉悶�繝輔ぃ繧､繝ｫ縺ｪ縺励〒) 荳�縺､縺ｮ繧ｳ繝槭Φ繝峨〒菴ｿ縺�％縺ｨ縺ｧ縲� 谺｡縺ｮ繧ゅ�繧堤ｰ｡蜊倥↓隕九▽縺代ｉ繧後∪縺�:

• 縺ｩ縺ｮ繧ｳ繝溘ャ繝医′縺薙�萓九�繧ｳ繝ｼ繝峨ｒ螢翫＠縺ｦ縺�ｋ縺�

• 縺ｩ縺ｮ繧ｳ繝溘ャ繝医°繧峨％縺ｮ萓九�繧ｳ繝ｼ繝峨′蜍穂ｽ懊＠蟋九ａ縺ｦ縺�ｋ縺�

• 縺ｩ縺ｮ繧ｳ繝溘ャ繝医′譛�蛻昴↓縺薙�豁｣隕剰｡ｨ迴ｾ縺ｫ繝槭ャ繝√Φ繧ｰ縺吶ｋ繝輔ぃ繧､繝ｫ繧定ｿｽ蜉�縺励◆縺�

• 縺ｩ縺ｮ繧ｳ繝溘ャ繝医′譛�蠕後↓縺薙�豁｣隕剰｡ｨ迴ｾ縺ｫ繝槭ャ繝√Φ繧ｰ縺吶ｋ繝輔ぃ繧､繝ｫ繧貞炎髯､縺励◆縺�

騾壼ｸｸ縺ｯ縺ｩ縺ｮ繝舌�繧ｸ繝ｧ繝ｳ縺ｮ perl 繧剃ｽｿ縺�°縺ｮ蟋狗せ縺ｨ邨らせ縺ｮ繝ｪ繝薙ず繝ｧ繝ｳ繧� 遏･縺｣縺ｦ縺�ｋ蠢�ｦ√�縺ゅｊ縺ｾ縺帙ｓ; Porting/bisect.pl 縺ｯ閾ｪ蜍慕噪縺ｫ縲� 繝�せ繝医こ繝ｼ繧ｹ縺碁�夐℃縺吶ｋ譛�蛻昴�螳牙ｮ夂沿繝舌�繧ｸ繝ｧ繝ｳ繧呈爾縺励∪縺吶�� Configure 縺ｨ繝薙Ν繝画凾繧ｪ繝励す繝ｧ繝ｳ繧貞性繧�螳悟�縺ｪ譁�嶌繧定ｦ九ｋ縺ｫ縺ｯ Porting/bisect.pl --help 繧貞ｮ溯｡後＠縺ｦ縺上□縺輔＞縲�

Porting/bisect.pl 縺梧署萓帙＠縺ｦ縺�ｋ繧ゅ�繧医ｊ繧ゅ＆繧峨↓譟碑ｻ滓�ｧ縺悟ｿ�ｦ√↑蝣ｴ蜷医�� git bisect 繧定�蛻��霄ｫ縺ｧ螳溯｡後☆繧句ｿ�ｦ√′縺ゅｊ縺ｾ縺吶�� perl 繝ｪ繝薙ず繝ｧ繝ｳ縺ｮ繝薙Ν繝峨→繝�せ繝医ｒ閾ｪ蜍募喧縺吶ｋ縺溘ａ縺ｫ git bisect run 繧剃ｽｿ縺��縺梧怙繧ゆｾｿ蛻ｩ縺ｧ縺吶�� 縺薙�縺溘ａ縺ｫ縲∫音螳壹�繝ｪ繝薙ず繝ｧ繝ｳ繧偵ユ繧ｹ繝医☆繧九◆繧√↓蜻ｼ縺ｳ蜃ｺ縺吶◆繧√� git 縺ｮ縺溘ａ縺ｮ繧ｷ繧ｧ繝ｫ繧ｹ繧ｯ繝ｪ繝励ヨ縺悟ｿ�ｦ√〒縺吶�� 萓九�繧ｹ繧ｯ繝ｪ繝励ヨ縺ｯ Porting/bisect-example.sh 縺ｧ縲� 縺薙ｌ縺ｯ繝ｪ繝昴ず繝医Μ縺ｮ 螟門� 縺ｫ繧ｳ繝斐�縺吶ｋ縺ｹ縺阪〒縺�; bisect 蜃ｦ逅��縲∝ｮ溯｡後＆繧後ｋ縺ｨ繧ｯ繝ｪ繝ｼ繝ｳ縺ｪ繝√ぉ繝�け繧｢繧ｦ繝医�縺溘ａ縺ｫ 迥ｶ諷九ｒ繝ｪ繧ｻ繝�ヨ縺吶ｋ縺九ｉ縺ｧ縺吶�� 蠕瑚ｿｰ縺ｮ隱ｬ譏弱�縲√せ繧ｯ繝ｪ繝励ヨ繧� ~/run 縺ｨ縺励※繧ｳ繝斐�縺励※縲√◎繧後ｒ 驕ｩ蛻�↓邱ｨ髮�☆繧九％縺ｨ繧剃ｻｮ螳壹＠縺ｦ縺�∪縺吶��

縺ｾ縺� bisect 繝｢繝ｼ繝峨↓蜈･繧翫∪縺�:

% git bisect start

萓九∴縺ｰ縲√ヰ繧ｰ縺� HEAD 縺ｫ縺ゅ▲縺ｦ繧� 5.10.0 縺ｫ縺ｯ縺ｪ縺九▲縺溷�ｴ蜷医��git 縺ｯ 莉･荳九�繧医≧縺ｫ蜈･蜉帙☆繧九％縺ｨ縺ｧ縺薙ｌ繧貞ｭｦ鄙偵＠縺ｾ縺�:

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

縺薙�邨先棡縲�HEAD 縺ｨ perl-5.10.0 縺ｮ荳ｭ髢薙�繧ｳ繝溘ャ繝医′ 繝√ぉ繝�け繧｢繧ｦ繝医＆繧後∪縺吶�� 谺｡縺ｮ繧医≧縺ｫ縺励※ bisect 蜃ｦ逅�ｒ螳溯｡後＠縺ｾ縺�:

% git bisect run ~/run

譛�蛻昴�荳肴ｭ｣縺ｪ繧ｳ繝溘ャ繝医′蛻�屬縺輔ｌ繧九→縲�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

git bisect log 縺ｨ git bisect visualize 縺ｧ bisect 蜃ｦ逅�ｒ 隕励″隕九ｋ縺薙→縺後〒縺阪∪縺吶�� git bisect reset縺ｯ bisect 繝｢繝ｼ繝峨ｒ隗｣髯､縺励∪縺吶��

譛�蛻昴� good 迥ｶ諷九�縲∵怙蛻昴� bad 迥ｶ諷九�逾門�縺ｧ縺ゅｋ蠢�ｦ√′縺ゅｋ縺薙→縺ｫ 豕ｨ諢上＠縺ｦ縺上□縺輔＞縲� 菴輔ｉ縺九�繝舌げ繧� 隗｣豎ｺ縺励◆ 繧ｳ繝溘ャ繝医ｒ讀懃ｴ｢縺励◆縺��ｴ蜷医�縲√ユ繧ｹ繝医こ繝ｼ繧ｹ繧� 蜿崎ｻ｢縺輔○縲� (縺､縺ｾ繧翫�＾K 縺ｪ繧� 1 縺ｧ邨ゆｺ�＠縲√◎縺�〒縺ｪ縺�↑繧� 0 縺ｧ邨ゆｺ�☆繧�)縲� 荳矩剞繧� good縲∽ｸ企剞繧� bad 縺ｨ繝槭�繧ｯ縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺吶�� 縲梧怙蛻昴�荳肴ｭ｣縺ｪ繧ｳ繝溘ャ繝医�阪�縲√�後ヰ繧ｰ縺瑚ｧ｣豎ｺ縺輔ｌ縺滓怙蛻昴�繧ｳ繝溘ャ繝医�阪→ 隗｣驥医☆繧句ｿ�ｦ√′縺ゅｊ縺ｾ縺吶��

git help bisect 縺ｫ縺ｯ縲∽ｺ悟�謗｢邏｢繧貞ｾｮ隱ｿ謨ｴ縺吶ｋ譁ｹ豕輔↓髢｢縺吶ｋ諠��ｱ縺瑚ｱ雁ｯ後↓ 逕ｨ諢上＆繧後※縺�∪縺吶��

bisect 縺ｮ蠕後�｜isect 蜃ｦ逅�〒隴伜挨縺輔ｌ縺溘さ繝溘ャ繝医�譎らせ縺ｧ perl 繧定ｨｭ螳壹�� 繝薙Ν繝峨�√ユ繧ｹ繝医＠縺溘＞縺ｨ諤昴≧縺九ｂ縺励ｌ縺ｾ縺帙ｓ縲� 譎ゅ���∫音縺ｫ蜿､縺� perl 縺ｧ縺ｯ縲√％縺ｮ蜃ｦ逅�ｸｭ縺ｫ make 縺悟､ｱ謨励☆繧九％縺ｨ縺後≠繧翫∪縺吶�� 縺薙�蝣ｴ蜷医�∝商縺�さ繝溘ャ繝医�繝昴う繝ｳ繝医〒繧ｽ繝ｼ繧ｹ繧ｳ繝ｼ繝峨↓繝代ャ繝√ｒ蠖薙※繧九％縺ｨ縺� 縺ｧ縺阪ｋ縺九ｂ縺励ｌ縺ｾ縺帙ｓ縲� 縺昴≧縺吶ｋ縺溘ａ縺ｫ縺ｯ縲� "Building perl at older commits" in perlhack 縺ｧ謠蝉ｾ帙＆繧後※縺�ｋ謠先｡医↓ 蠕薙▲縺ｦ縺上□縺輔＞縲�

Topic branches and rewriting history

(繝医ヴ繝�け繝悶Λ繝ｳ繝√→螻･豁ｴ縺ｮ譖ｸ縺肴鋤縺�)

蛟九���繧ｳ繝溘ャ繧ｿ繝ｼ縺ｯ縲�yourname/some_descriptive_name 縺ｮ荳九↓繝医ヴ繝�け繝悶Λ繝ｳ繝√ｒ菴懈�縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺�:

% branch="$yourname/$some_descriptive_name"
% git checkout -b $branch
... do local edits, commits etc ...
% git push origin -u $branch

縺ｨ縺ｦ繧ょ商縺�ヰ繝ｼ繧ｸ繝ｧ繝ｳ (1.7 繧医ｊ蜑�) 縺ｮ git 繧偵∪縺�菴ｿ縺｣縺ｦ縺�ｋ蝣ｴ蜷医�� git push 縺ｫ縺ｯ -u 繧ｪ繝励す繝ｧ繝ｳ縺後≠繧翫∪縺帙ｓ; 譛�蠕後�謇矩��ｒ谺｡縺ｮ繧ゅ�縺ｧ鄂ｮ縺肴鋤縺医ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺�:

% git push origin $branch:refs/heads/$branch
% git config branch.$branch.remote origin
% git config branch.$branch.merge refs/heads/$branch

莉悶�莠ｺ縺ｮ繝医ヴ繝�け繝悶Λ繝ｳ繝√ｒ螟画峩縺励◆縺��ｴ蜷医�∝､画峩縺吶ｋ蜑阪↓ 縺昴�菴懈�閠�↓遒ｺ隱阪☆繧句ｿ�ｦ√′縺ゅｊ縺ｾ縺吶��

蜈��菴懈�閠�′繝悶Λ繝ｳ繝√�螻･豁ｴ繧堤ｷｨ髮�＠縺溘％縺ｨ縺ｫ豌嶺ｻ倥￥縺薙→縺後≠繧翫∪縺吶�� 縺薙ｌ縺ｫ縺ｯ螟壹￥縺ｮ豁｣蠖薙↑逅�罰縺後≠繧翫∪縺吶�� 蝣ｴ蜷医↓繧医▲縺ｦ縺ｯ縲∝腰縺ｫ繝悶Λ繝ｳ繝√ｒ譁ｰ縺励＞繧ｽ繝ｼ繧ｹ繝昴う繝ｳ繝医↓蝓ｺ縺･縺�※ 菴懊ｊ逶ｴ縺吶％縺ｨ縺ｫ縺ｪ繧九％縺ｨ繧ゅ≠繧翫∪縺吶�� 蝣ｴ蜷医↓繧医▲縺ｦ縺ｯ縲√ヶ繝ｩ繝ｳ繝√ｒ blead 縺ｫ繝槭�繧ｸ縺吶ｋ蜑阪↓縲� 蛻晄悄縺ｮ繧ｳ繝溘ャ繝医〒菫ｮ豁｣縺励◆縺�お繝ｩ繝ｼ繧定ｦ九▽縺代◆縺薙→繧ゅ≠繧翫∪縺吶��

迴ｾ蝨ｨ縲√�繧ｹ繧ｿ繝ｼ繝ｪ繝昴ず繝医Μ縺ｯ縲�撼 fast-forward 縺ｮ繝槭�繧ｸ繧堤ｦ∵ｭ｢縺吶ｋ繧医≧縺ｫ 讒区�縺輔ｌ縺ｦ縺�∪縺吶�� 縺薙ｌ縺ｯ縲∽ｸｭ縺ｮ繝悶Λ繝ｳ繝√�繝ｪ繝吶�繧ｹ縺ｨ繝励ャ繧ｷ繝･繧貞腰荳�繧ｹ繝�ャ繝励→縺励※縺ｯ 縺ｧ縺阪↑縺�％縺ｨ繧呈э蜻ｳ縺励∪縺吶��

繝励ャ繧ｷ繝･縺輔ｌ縺溘ヶ繝ｩ繝ｳ繝√�螻･豁ｴ繧貞�蜿門ｾ励∪縺溘�螟画峩縺吶ｋ蜚ｯ荳�縺ｮ譁ｹ豕輔�縲� 縺昴�繝悶Λ繝ｳ繝√ｒ蜑企勁縺励�∝酔縺伜錐蜑阪〒譁ｰ縺励＞繝悶Λ繝ｳ繝√→縺励※繝励ャ繧ｷ繝･縺吶ｋ縺薙→縺ｧ縺吶�� 縺薙ｌ繧定｡後≧縺薙→縺ｫ縺､縺�※縺ｯ諷朱㍾縺ｫ讀懆ｨ弱＠縺ｦ縺上□縺輔＞縲� 莉悶�繝ｦ繝ｼ繧ｶ繝ｼ縺梧眠縺励＞繝舌�繧ｸ繝ｧ繝ｳ縺ｫ繝ｭ繝ｼ繧ｫ繝ｫ縺ｮ螟画峩繧堤ｰ｡蜊倥↓ 繝√ぉ繝ｪ繝ｼ繝斐ャ繧ｯ縺ｧ縺阪ｋ繧医≧縺ｫ縲� 繝悶Λ繝ｳ繝√�蜷榊燕繧帝��分縺ｫ螟画峩縺励◆譁ｹ縺後ｈ縺��ｴ蜷医′縺ゅｊ縺ｾ縺�(XXX:隱ｬ譏弱′蠢�ｦ�)縲�

蛟倶ｺｺ逧�↑繝医ヴ繝�け繝悶Λ繝ｳ繝√ｒ繝ｪ繝吶�繧ｹ縺励◆縺��ｴ蜷医�縲� 譌｢蟄倥�繝医ヴ繝�け繝悶Λ繝ｳ繝√ｒ蜑企勁縺励�∵眠縺励＞繝舌�繧ｸ繝ｧ繝ｳ縺ｨ縺励※ 繝励ャ繧ｷ繝･縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺吶�� 縺薙ｌ縺ｯ縲√ヶ繝ｩ繝ｳ繝√ｒ繝ｪ繝吶�繧ｹ縺励◆蠕後�∵ｬ｡縺ｮ蜈ｬ蠑� (隧ｳ邏ｰ縺ｯ git push 譁�嶌縺ｮ 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

豕ｨ諢�: 繝ｪ繝昴ず繝医Μ繝ｬ繝吶Ν縺ｧ"繝励Λ繧､繝槭Μ"繝悶Λ繝ｳ繝√ｒ蜑企勁縺吶ｋ縺薙→縺ｯ 遖∵ｭ｢縺輔ｌ縺ｦ縺�∪縺吶�� 縺薙ｌ縺ｯ m!^(blead maint perl)! 縺ｫ繝槭ャ繝√Φ繧ｰ縺吶ｋ繝悶Λ繝ｳ繝√〒縺吶�� 蜑企勁縺励ｈ縺�→縺吶ｋ縺ｨ縲“it縺ｯ谺｡縺ｮ繧医≧縺ｪ繧ｨ繝ｩ繝ｼ繧堤函謌舌＠縺ｾ縺�:

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

繝昴Μ繧ｷ繝ｼ縺ｨ縺励※縲｜lead 繝悶Λ繝ｳ繝√→ maint-* 繝悶Λ繝ｳ繝√�螻･豁ｴ縺ｯ邱ｨ髮� 縺励∪縺帙ｓ縲� 繧ｿ繧､繝励Α繧ｹ(縺ｾ縺溘�縺昴ｌ莉･荳�)縺� blead 縺ｾ縺溘� maint-* 縺ｸ縺ｮ繧ｳ繝溘ャ繝医↓ 蠢阪�霎ｼ繧薙□蝣ｴ蜷医�縲∝挨縺ｮ繧ｳ繝溘ャ繝医〒菫ｮ豁｣縺励∪縺吶�� 縺薙ｌ繧峨�繝悶Λ繝ｳ繝√〒險ｱ蜿ｯ縺輔ｌ縺ｦ縺�ｋ譖ｴ譁ｰ縺ｮ繧ｿ繧､繝励� "fast-forward" 縺�縺代〒縲� 縺吶∋縺ｦ縺ｮ螻･豁ｴ縺御ｿ晏ｭ倥＆繧後∪縺吶��

讓呎ｺ也噪縺ｪ perl.git 繝ｪ繝昴ず繝医Μ蜀��豕ｨ驥井ｻ倥″繧ｿ繧ｰ縺ｯ縲∝炎髯､繧� 螟画峩縺輔ｌ繧九％縺ｨ縺ｯ縺ゅｊ縺ｾ縺帙ｓ縲� 繝ｭ繝ｼ繧ｫ繝ｫ繧ｿ繧ｰ繧� perl.git 縺ｫ繝励ャ繧ｷ繝･縺吶ｋ蜑阪↓縲√§縺｣縺上ｊ閠�∴縺ｦ縺ｿ縺ｦ縺上□縺輔＞ (蜊倡ｴ斐ち繧ｰ縺ｮ繝励ャ繧ｷ繝･縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺�∪縺帙ｓ)縲�

Grafts

(謗･縺取惠)

Perl螻･豁ｴ縺ｫ縺ｯ縲∝､画鋤縺ｧ讀懷�縺輔ｌ縺ｪ縺九▲縺溯ｪ､繧翫′荳�縺､蜷ｫ縺ｾ繧後※縺�∪縺�: blead 縺ｨ maint-5.10 縺ｮ髢薙�螻･豁ｴ縺ｫ繝槭�繧ｸ縺瑚ｨ倬鹸縺輔ｌ縺ｾ縺励◆縺後�� 螳滄圀縺ｫ縺ｯ繝槭�繧ｸ縺ｯ逋ｺ逕溘＠縺ｾ縺帙ｓ縺ｧ縺励◆縲� git 縺ｮ諤ｧ雉ｪ荳翫�√ヱ繝悶Μ繝�け繝ｪ繝昴ず繝医Μ縺ｧ菫ｮ豁｣縺吶ｋ縺薙→縺ｯ迴ｾ蝨ｨ荳榊庄閭ｽ縺ｧ縺吶�� .git/info/graft 繝輔ぃ繧､繝ｫ縺ｫ谺｡縺ｮ陦後ｒ霑ｽ蜉�縺吶ｋ縺薙→縺ｧ縲� 縺薙�隱､縺｣縺溘�繝ｼ繧ｸ繧偵Ο繝ｼ繧ｫ繝ｫ縺ｧ蜑企勁縺ｧ縺阪∪縺吶��

296f12bbbbaa06de9be9d09d3dcf8f4528898a49 434946e0cb7a32589ed92d18008aaa1d88515930

蝠城｡後�縲後�繝ｼ繧ｸ縲埼�伜沺縺ｧ bisect 縺瑚｡後ｏ繧後ｋ蝣ｴ蜷医�√％縺ｮ graft 陦後ｒ 謖�ｮ壹☆繧九％縺ｨ縺檎音縺ｫ驥崎ｦ√〒縺吶��

WRITE ACCESS TO THE GIT REPOSITORY

(git 繝ｪ繝昴ず繝医Μ縺ｸ縺ｮ譖ｸ縺崎ｾｼ縺ｿ繧｢繧ｯ繧ｻ繧ｹ)

荳�譌ｦ譖ｸ縺崎ｾｼ縺ｿ讓ｩ髯舌ｒ蠕励◆繧峨�� 繝励ャ繧ｷ繝･繧呈怏蜉ｹ縺ｫ縺吶ｋ縺溘ａ縺ｫ origin remote 縺ｮ縺溘ａ縺ｮ URL 繧� 螟画峩縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺吶�� git-config(1) 繧ｳ繝槭Φ繝峨〒 .git/config 繧呈ｬ｡縺ｮ繧医≧縺ｫ邱ｨ髮�＠縺ｾ縺�:

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

繝ｦ繝ｼ繧ｶ繝ｼ蜷阪→髮ｻ蟄舌Γ繝ｼ繝ｫ繧｢繝峨Ξ繧ｹ繧定ｨｭ螳壹☆繧九％縺ｨ繧ゅ〒縺阪∪縺吶�� 縺ｻ縺ｨ繧薙←縺ｮ莠ｺ縺ｯ縲∽ｻ･荳九�繧医≧縺ｫ縺吶ｋ縺薙→縺ｧ ~/.gitconfig 縺ｧ繧ｰ繝ｭ繝ｼ繝舌Ν縺ｫ 荳�蠎ｦ縺薙ｌ繧定｡後＞縺ｾ縺�:

% git config --global user.name "ﾆvar Arnfj� Bjarmason"
% git config --global user.email avarab@gmail.com

縺励°縺励�｝erl 縺�縺代↓蟇ｾ縺励※縺薙ｌ繧貞､画峩縺励◆縺��ｴ蜷医�縲� perl 縺ｧ谺｡縺ｮ繧医≧縺ｪ繧ゅ�繧貞ｮ溯｡後＠縺ｾ縺�:

% git config user.email avar@cpan.org

origin 繧� git remote 縺ｨ縺励※邯ｭ謖√＠縲《sh 繧｢繧ｯ繧ｻ繧ｹ逕ｨ縺ｮ譁ｰ縺励＞ remote 繧� 霑ｽ蜉�縺吶ｋ縺薙→繧ょ庄閭ｽ縺ｧ縺�:

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

縺薙ｌ縺ｫ繧医ｊ縲�origin 縺九ｉ繝励Ν縺励※繝ｭ繝ｼ繧ｫ繝ｫ繝ｪ繝昴ず繝医Μ繧呈峩譁ｰ縺ｧ縺阪∪縺�; 縺薙ｌ縺ｯ繧医ｊ鬮倬�溘〒縲∬ｪ崎ｨｼ繧貞ｿ�ｦ√→縺励∪縺帙ｓ; 縺ｾ縺溘��camel 繝ｪ繝｢繝ｼ繝医〒螟画峩繧偵�繝�す繝･繝舌ャ繧ｯ縺吶ｋ縺薙→繧ゅ〒縺阪∪縺吶��

% git fetch camel
% git push camel

fetch 繧ｳ繝槭Φ繝峨�蜊倥↓ camel refs 繧呈峩譁ｰ縺吶ｋ縺�縺代〒縺�; 縺ｪ縺懊↑繧峨�√が繝悶ず繧ｧ繧ｯ繝郁�菴薙� origin 縺九ｉ繝励Ν縺吶ｋ縺ｨ縺阪↓ 繝輔ぉ繝�メ縺輔ｌ繧九∋縺阪□縺九ｉ縺ｧ縺吶��

Accepting a patch

(繝代ャ繝√ｒ蜿励￠蜈･繧後ｋ)

蜑崎ｿｰ縺ｮ遽�縺ｧ繧剃ｽｿ縺｣縺ｦ逕滓�縺輔ｌ縺溘ヱ繝�メ繝輔ぃ繧､繝ｫ繧貞女縺大叙縺｣縺溷�ｴ蜷医�縲� 繝代ャ繝√ｒ隧ｦ縺励※縺ｿ縺ｦ縺上□縺輔＞縲�

縺ｾ縺壹�√％繧後ｉ縺ｮ螟画峩縺ｮ縺溘ａ縺ｮ荳�譎ら噪縺ｪ譁ｰ縺励＞繝悶Λ繝ｳ繝√ｒ菴懈�縺励�√◎縺ｮ繝悶Λ繝ｳ繝√↓ 蛻�ｊ譖ｿ縺医ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺�:

% git checkout -b experimental

git format-patch 縺ｧ繝輔か繝ｼ繝槭ャ繝医＆繧後◆繝代ャ繝√�縲�git am 縺ｧ驕ｩ逕ｨ縺輔ｌ縺ｾ縺�:

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

荳�驛ｨ縺ｮ UNIX 繝｡繝ｼ繝ｫ繧ｷ繧ｹ繝�Β縺ｯ縲∵ｷｻ莉倥ユ繧ｭ繧ｹ繝医↓ 'From ' 縺悟性縺ｾ繧後※縺�ｋ縺ｨ 縺翫°縺励￥縺ｪ繧九°繧ゅ＠繧後↑縺�％縺ｨ縺ｫ豕ｨ諢上＠縺ｦ縺上□縺輔＞縲� 縺薙ｌ縺ｯ谺｡縺ｮ繧医≧縺ｫ縺励※菫ｮ豁｣縺励∪縺�:

% perl -pi -e's/^>From /From /' \
                       0001-Rename-Leon-Brocard-to-Orange-Brocard.patch

逕溘� diff 縺�縺代′謠蝉ｾ帙＆繧後※縺�ｋ蝣ｴ蜷医�縲∵ｬ｡縺ｮ 2 谿ｵ髫弱�繝励Ο繧ｻ繧ｹ繧� 菴ｿ逕ｨ縺吶ｋ縺薙→繧ゅ〒縺阪∪縺�:

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

縺薙％縺ｧ螟画峩繧呈､懈渊縺ｧ縺阪∪縺�:

% 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>

繧ゅ＠縺ゅ↑縺溘′ Perl 縺ｮ繧ｳ繝溘ャ繧ｿ縺ｧ縲√ヱ繝�メ縺瑚憶縺�ｂ縺ｮ縺�縺ｨ諤昴≧縺ｪ繧峨�� 縺昴ｌ繧� blead 縺ｫ繝槭�繧ｸ縺励※繝｡繧､繝ｳ縺ｮ繝ｪ繝昴ず繝医Μ縺ｫ繝励ャ繧ｷ繝･縺吶ｋ縺薙→縺後〒縺阪∪縺�:

% git checkout blead
% git merge experimental
% git push origin blead

荳�譎ら噪縺ｪ繝悶Λ繝ｳ繝√ｒ蜑企勁縺励◆縺�↑繧峨�∽ｻ･荳九�繧医≧縺ｫ縺ｧ縺阪∪縺�:

% 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.

Committing to blead

(blead 縺ｫ繧ｳ繝溘ャ繝医☆繧�)

'blead' 繝悶Λ繝ｳ繝√�縲￣erl 縺ｮ谺｡縺ｮ豁｣蠑冗沿繝ｪ繝ｪ繝ｼ繧ｹ縺ｫ縺ｪ繧翫∪縺吶��

菴輔ｉ縺九� 繝ｭ繝ｼ繧ｫ繝ｫ縺ｪ螟画峩繧偵�繝�す繝･縺吶ｋ蜑阪↓縲� 縺ゅ↑縺溘�蠕後°繧画擂繧倶ｻ悶�繧ｳ繝溘ャ繧ｿ縺檎�謇九→譚ｾ譏弱ｒ謖√▲縺ｦ縺薙↑縺�ｈ縺�↓縲� 縺�￥縺､縺九�縺薙→繧偵☆繧九�縺梧･ｵ繧√※驥崎ｦ√〒縺�:

• 繧医＞繧ｳ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ繧呈嶌縺上ｈ縺�↓縺励※縺上□縺輔＞縲� 隧ｳ縺励￥縺ｯ "Commit message" in perlhack 繧貞盾辣ｧ縺励※縺上□縺輔＞縲�

• 繝�せ繝医せ繧､繝ｼ繝医ｒ螳溯｡後＠縺ｾ縺吶�� 荳�縺､縺ｮ繧ｿ繧､繝励Α繧ｹ菫ｮ豁｣縺後ユ繧ｹ繝医ヵ繧｡繧､繝ｫ繧貞｣翫☆縺ｨ縺ｯ諤昴ｏ縺ｪ縺�°繧ゅ＠繧後∪縺帙ｓ縲� 縺昴ｌ縺ｯ髢馴＆縺�〒縺吶�� 繧ｹ繧､繝ｼ繝医ｒ螳溯｡後＠縺ｪ縺�→蝠城｡後′逋ｺ逕溘☆繧倶ｾ九ｒ谺｡縺ｫ遉ｺ縺励∪縺吶�� 譌｢蟄倥� .t 縺ｫ縺�￥縺､縺九�繝�せ繝医ｒ霑ｽ蜉�縺吶ｋ繝代ャ繝√′謠仙�縺輔ｌ縺ｾ縺励◆縲� 莉悶�菴輔↓繧ょｽｱ髻ｿ縺吶ｋ蜿ｯ閭ｽ諤ｧ縺ｯ縺ｪ縺��縺ｧ縲� 蠖ｱ髻ｿ繧貞女縺代◆荳�縺､縺ｮ .t 莉･荳翫ｒ繝�せ繝医☆繧句ｿ�ｦ√�縺ゅｊ縺ｾ縺帙ｓ縲� 縺昴≧縺ｧ縺吶�? 縺励°縺励���∽ｿ｡閠��繝｡繝ｼ繝ｫ繧｢繝峨Ξ繧ｹ縺悟燕蝗槭�騾∽ｿ｡譎ゅ°繧牙､画峩縺輔ｌ縺ｦ縺�※縲� 縺薙�縺溘ａ縺ｮ莉悶�繝�せ繝医′螟ｱ謨励☆繧九ｈ縺�↓縺ｪ繧翫∪縺励◆縲� 谺｡縺ｮ鬆�岼縺ｮ繝�せ繝医ち繝ｼ繧ｲ繝�ヨ繧貞ｮ溯｡後☆繧九→縲√％縺ｮ蝠城｡後ｒ謐輔∪縺医ｉ繧後∪縺吶��

• 螳悟�縺ｪ繝�せ繝医せ繧､繝ｼ繝医ｒ螳溯｡後＠縺ｪ縺��ｴ蜷医〒繧ゅ�� 譛�菴� make test_porting 縺ｯ螳溯｡後＠縺ｦ縺上□縺輔＞縲� 縺薙ｌ縺ｯ蝓ｺ譛ｬ逧�↑豁｣豌励メ繧ｧ繝�け繧貞ｮ溯｡後＠縺ｾ縺吶�� 縺ｩ縺ｮ豁｣豌励メ繧ｧ繝�け縺九ｒ隕九ｋ縺ｫ縺ｯ縲�t/porting 繧定ｦ九※縺上□縺輔＞縲�

• miniperl 繧� miniperl 縺ｮ縺溘ａ縺ｮ逡ｰ縺ｪ繧九さ繝ｼ繝峨ヱ繧ｹ繧呈戟縺､繧ｳ繧｢繝ｫ繝ｼ繝√Φ縺ｫ 蠖ｱ髻ｿ縺吶ｋ螟画峩繧定｡後≧蝣ｴ蜷医��make minitest 繧偵☆繧九ｈ縺�↓縺励※縺上□縺輔＞縲� 縺薙ｌ縺ｯ縲｝erl 縺ｧ縺ｯ縺ｪ縺� miniperl 縺ｧ繝�せ繝医�荳�驛ｨ繧定｡後≧縺溘ａ縺ｫ螳悟�縺ｪ 繝�せ繝医せ繧､繝ｼ繝医〒縺ｯ謐墓拷縺ｧ縺阪↑縺�撫鬘後ｂ謐墓拷縺励∪縺吶��

On merging and rebasing

(繝槭�繧ｸ縺ｨ繝ｪ繝吶�繧ｹ譎�)

'blead' 繝悶Λ繝ｳ繝√↓繝励ャ繧ｷ繝･縺輔ｌ縺溘�∝腰邏斐↑ 1 蝗樣剞繧翫�繧ｳ繝溘ャ繝医�縲� 繧ｯ繝ｪ繝ｼ繝ｳ縺ｫ驕ｩ逕ｨ縺輔ｌ繧句腰邏斐↑繧ｳ繝溘ャ繝医〒縺ゅｋ縺ｹ縺阪〒縺吶�� 險�縺�鋤縺医ｋ縺ｨ縲∽ｽ懈･ｭ縺励◆繧ゅ�縺ｯ blead 縺ｮ迴ｾ蝨ｨ縺ｮ菴咲ｽｮ縺ｫ蟇ｾ縺励※ 繧ｳ繝溘ャ繝医☆繧九％縺ｨ縺ｧ縲√�繝ｼ繧ｸ縺吶ｋ縺薙→縺ｪ縺� master 縺ｫ 繝励ャ繧ｷ繝･縺ｧ縺阪ｋ繧医≧縺ｫ縺吶ｋ縺ｹ縺阪〒縺吶��

縺ゅ↑縺溘′螟画峩縺励◆繧ゅ�繧偵ン繝ｫ繝峨＠縺溘ｊ繝�せ繝医＠縺溘ｊ縺励※縺�ｋ髢薙↓縲� 譎ゅ�� blead 縺ｯ蜍輔″縺ｾ縺吶�� 縺薙ｌ縺瑚ｵｷ縺阪ｋ縺ｨ縲√�繝�す繝･縺ｯ谺｡縺ｮ繧医≧縺ｪ繝｡繝�そ繝ｼ繧ｸ縺ｧ諡貞凄縺輔ｌ縺ｾ縺�:

To ssh://perl5.git.perl.org/perl.git
 ! [rejected]        blead -> blead (non-fast-forward)
error: failed to push some refs to 'ssh://perl5.git.perl.org/perl.git'
To prevent you from losing history, non-fast-forward updates were
rejected Merge the remote changes (e.g. 'git pull') before pushing
again.  See the 'Note about fast-forwards' section of 'git push --help'
for details.

縺薙ｌ縺瑚ｵｷ縺阪◆蝣ｴ蜷医�∵ｬ｡縺ｮ繧医≧縺ｫ縺励※縲｜lead 縺ｮ譁ｰ縺励＞菴咲ｽｮ縺ｫ蟇ｾ縺励※縺ゅ↑縺溘�菴懈･ｭ繧� 蜊倥↓ 繝ｪ繝吶�繧ｹ 縺励∪縺� (master 繝ｪ繝昴ず繝医Μ縺ｫ蟇ｾ縺吶ｋ縺ゅ↑縺溘�繝ｪ繝｢繝ｼ繝亥錐繧� "p5p" 縺ｨ莉ｮ螳壹＠縺ｾ縺�):

% git fetch p5p
% git rebase p5p/blead

繧ｳ繝溘ャ繝医′蜀埼←逕ｨ縺輔ｌ縲∝ｮ牙�縺ｫ繝励ャ繧ｷ繝･縺ｧ縺阪ｋ繧医≧縺ｫ縺ｪ繧翫∪縺吶�� 繝ｪ繝吶�繧ｹ縺ｫ髢｢縺吶ｋ縺輔ｉ縺ｪ繧区ュ蝣ｱ縺ｯ縲“it-rebase(1) 繧ｳ繝槭Φ繝峨�譁�嶌縺ｫ縺ゅｊ縺ｾ縺吶��

荳�邱偵↓縺吶ｋ縺薙→縺ｧ縺ｮ縺ｿ諢丞袖縺後≠繧九�√∪縺溘�髮�粋縺ｮ逶ｮ逧��隕∫ｴ�→縺励※縺ｮ 萓｡蛟､縺後≠繧九ｈ縺�↑縲√ｈ繧雁､ｧ縺阪↑繧ｳ繝溘ャ繝医�髮�粋縺ｫ蟇ｾ縺励※縺ｯ縲� 繝槭�繧ｸ繧ｳ繝溘ャ繝医ｒ菴ｿ縺�∋縺阪〒縺吶�� 菴懈･ｭ縺ｯ 繝医ヴ繝�け繝悶Λ繝ｳ繝� 縺ｧ陦後≧縺ｹ縺阪〒縺�; 縺昴＠縺ｦ縲｜lead 縺ｮ遘ｻ蜍輔↓繧医▲縺ｦ縺ゅ↑縺溘�繧ｳ繝ｼ繝峨′螢翫ｌ縺ｦ縺�↑縺�％縺ｨ繧� 遒ｺ隱阪☆繧九◆繧√↓螳壽悄逧�↓ blead 縺ｫ蟇ｾ縺励※繝ｪ繝吶�繧ｹ縺吶ｋ縺ｹ縺阪〒縺吶�� 菴懈･ｭ縺檎ｵゅｏ縺｣縺溘ｉ縲∵怙蠕後↓繝ｪ繝吶�繧ｹ縺励※繝�せ繝医＠縺ｦ縺上□縺輔＞縲� 邱壼ｽ｢縺ｮ螻･豁ｴ縺ｯ blead 縺ｫ繧ｳ繝溘ャ繝医＆繧後ｋ蠎ｦ縺ｫ螟ｱ繧上ｌ縺ｾ縺吶′縲� 譛�蠕後�繝ｪ繝吶�繧ｹ縺ｯ蜀阪�螻･豁ｴ繧堤ｷ壼ｽ｢縺ｫ縺励�� 蟆�擂縺ｮ菫晏ｮ郁��′菴輔′襍ｷ縺阪◆縺ｮ縺九ｒ隕九ｋ縺ｮ繧偵ｈ繧雁ｮｹ譏薙↓縺励∪縺吶�� 谺｡縺ｮ繧医≧縺ｫ縺励※繝ｪ繝吶�繧ｹ縺励∪縺� (縺ゅ↑縺溘�菴懈･ｭ縺� committer/somework 繝悶Λ繝ｳ繝√↓縺ゅｋ縺ｨ莉ｮ螳壹＠縺ｾ縺�):

% git checkout committer/somework
% git rebase blead

縺昴ｌ縺九ｉ谺｡縺ｮ繧医≧縺ｫ縺励※ master 縺ｫ繝槭�繧ｸ縺ｧ縺阪∪縺�:

% git checkout blead
% git merge --no-ff --no-commit committer/somework
% git commit -a

蜑崎ｿｰ縺ｮ繧ｹ繧､繝�メ縺ｯ隱ｬ譏弱′蠢�ｦ√〒縺励ｇ縺��� --no-ff 縺ｯ縲√◆縺ｨ縺医≠縺ｪ縺溘�菴懈･ｭ縺� blead 縺ｫ蟇ｾ縺励※邱壼ｽ｢縺ｫ驕ｩ逕ｨ蜿ｯ閭ｽ縺ｧ繧ゅ�� 繝槭�繧ｸ繧ｳ繝溘ャ繝医′貅門ｙ縺輔ｌ繧九％縺ｨ繧堤､ｺ縺励∪縺吶�� 縺薙ｌ縺ｫ繧医ｊ縺ゅ↑縺溘�菴懈･ｭ縺ｯ蛛ｴ驕薙�繝悶Λ繝ｳ繝√→縺励※陦ｨ遉ｺ縺輔ｌ縲� 縺昴�繧ｳ繝溘ャ繝医�繝槭�繧ｸ繧ｳ繝溘ャ繝医↓繧医▲縺ｦ繝｡繧､繝ｳ縺ｮ blead 縺ｫ 繝槭�繧ｸ縺輔ｌ繧九％縺ｨ縺ｫ縺ｪ繧翫∪縺吶��

--no-commit 縺ｯ縲√�繝ｼ繧ｸ繧ｳ繝溘ャ繝医� 貅門ｙ 縺ｯ縺輔ｌ縺ｾ縺吶′ 繧ｳ繝溘ャ繝� 縺ｯ縺輔ｌ縺ｪ縺�％縺ｨ繧呈э蜻ｳ縺励∪縺吶�� 繧ｳ繝溘ャ繝医�螳滄圀縺ｫ縺ｯ谺｡縺ｮ繧ｳ繝槭Φ繝峨ｒ螳溯｡後＠縺ｦ縲� 繧ｳ繝溘ャ繝医�隱ｬ譏弱�縺溘ａ縺ｫ繧ｨ繝�ぅ繧ｿ縺瑚ｵｷ蜍輔＠縺溷ｾ後↓螳溯｡後＆繧後∪縺吶�� --no-commit 縺ｪ縺励�蝣ｴ蜷医�� 譛臥畑縺ｪ繝｡繝�そ繝ｼ繧ｸ縺ｪ縺励〒繧ｳ繝溘ャ繝医′陦後ｏ繧後∪縺�; 縺薙ｌ縺ｯ菴懈･ｭ縺ｮ隱ｬ譏弱�縺溘ａ縺ｮ繝励Ξ繝ｼ繧ｹ繝帙Ν繝�縺ｨ縺励※繝槭�繧ｸ繧ｳ繝溘ャ繝医�萓｡蛟､繧� 螟ｧ蟷�↓貂帙ｉ縺励※縺励∪縺�∪縺吶��

繝槭�繧ｸ繧ｳ繝溘ャ繝医�隱ｬ譏弱ｒ譖ｸ縺上→縺阪�� 縺薙�繝悶Λ繝ｳ繝√�逶ｮ逧�ｒ隱ｬ譏弱＠縺ｦ縺上□縺輔＞; 縺昴＠縺ｦ縺薙�隱ｬ譏弱�縺翫◎繧峨￥谺｡縺ｮ perldelta 譁�嶌繧偵Ξ繝薙Η繝ｼ縺吶ｋ縺ｨ縺阪↓ 譛�邨ら噪縺ｪ繝ｪ繝ｪ繝ｼ繧ｹ繧ｨ繝ｳ繧ｸ繝九い縺ｫ繧医▲縺ｦ菴ｿ繧上ｌ繧九□繧阪≧縺ｨ縺�≧縺薙→繧� 蠢�↓逡吶ａ縺ｦ縺翫＞縺ｦ縺上□縺輔＞縲�

Committing to maintenance versions

(繝｡繝ｳ繝�リ繝ｳ繧ｹ繝舌�繧ｸ繝ｧ繝ｳ縺ｫ繧ｳ繝溘ャ繝医☆繧�)

繝｡繝ｳ繝�リ繝ｳ繧ｹ繝舌�繧ｸ繝ｧ繝ｳ縺ｯ縲�㍾隕√↑繝舌げ菫ｮ豁｣繧定ｿｽ蜉�縺吶ｋ蝣ｴ蜷医↓縺ｮ縺ｿ螟画峩縺励※縺上□縺輔＞; perlpolicy 繧貞盾辣ｧ縺励※縺上□縺輔＞縲�

perl 縺ｮ繝｡繝ｳ繝�リ繝ｳ繧ｹ繝舌�繧ｸ繝ｧ繝ｳ縺ｫ繧ｳ繝溘ャ繝医☆繧九↓縺ｯ縲� 繝ｭ繝ｼ繧ｫ繝ｫ霑ｽ霍｡繝悶Λ繝ｳ繝√ｒ菴懈�縺吶ｋ蠢�ｦ√′縺ゅｊ縺ｾ縺吶��

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

縺薙ｌ縺ｫ繧医ｊ縲√Μ繝｢繝ｼ繝医ヶ繝ｩ繝ｳ繝� origin/maint-5.005 繧定ｿｽ霍｡縺吶ｋ maint-5.005 縺ｨ縺�≧蜷榊燕縺ｮ繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√′菴懈�縺輔ｌ縺ｾ縺吶�� 谺｡縺ｫ縲∽ｻ･蜑阪→蜷後§繧医≧縺ｫ繝励Ν縲√さ繝溘ャ繝医�√�繝ｼ繧ｸ縲√�繝�す繝･繧定｡後≧縺薙→縺後〒縺阪∪縺吶��

git cherry-pick 繧ｳ繝槭Φ繝峨ｒ菴ｿ逕ｨ縺励※縲｜lead 縺ｨ蛻･縺ｮ繝悶Λ繝ｳ繝√°繧� 繧ｳ繝溘ャ繝医ｒ繝√ぉ繝ｪ繝ｼ繝斐ャ繧ｯ縺吶ｋ縺薙→繧ゅ〒縺阪∪縺吶�� 蜈��繧ｳ繝溘ャ繝医� SHA1 繧呈眠縺励＞繧ｳ繝溘ャ繝医Γ繝�そ繝ｼ繧ｸ縺ｫ險倬鹸縺吶ｋ縺溘ａ縺ｫ縲� git cherry-pick 縺ｫ -x 繧ｪ繝励す繝ｧ繝ｳ繧剃ｽｿ縺�％縺ｨ繧貞匡繧√∪縺吶��

maint 迚医↓菴輔°繧偵�繝�す繝･縺吶ｋ蜑阪↓縲∝燕霑ｰ縺ｮ "Committing to blead" 縺ｮ繧ｹ繝�ャ繝励ｒ貅�縺溘＠縺ｦ縺�ｋ縺薙→繧堤｢ｺ隱阪＠縺ｦ縺上□縺輔＞縲�

Merging from a branch via GitHub

(GitHub 邨檎罰縺ｮ繝悶Λ繝ｳ繝√ｒ繝槭�繧ｸ縺吶ｋ)

遘√◆縺｡縺ｯ繝代ャ繝√ｒ GitHub 邨檎罰縺ｧ謚慕ｨｿ縺吶ｋ縺薙→繧貞匡繧√※縺�∪縺帙ｓ縺後�� 螳滄圀逋ｺ逕溘＠縺ｾ縺吶�� 縺薙ｌ縺ｯ GitHub 繝ｪ繝昴ず繝医Μ縺九ｉ縺ｮ繝代ャ繝√ｒ繝槭�繧ｸ縺吶ｋ縺溘ａ縺ｮ繧ｬ繧､繝峨〒縺吶��

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

縺薙ｌ縺ｧ縲√◎縺ｮ繝悶Λ繝ｳ繝√→ blead 縺ｮ蟾ｮ蛻�ｒ隕九ｉ繧後ｋ繧医≧縺ｫ縺ｪ繧翫∪縺励◆:

% git diff avar/orange

縺昴＠縺ｦ繧ｳ繝溘ャ繝医ｒ陦ｨ遉ｺ縺ｧ縺阪∪縺�:

% git log avar/orange

迚ｹ螳壹�繧ｳ繝溘ャ繝医ｒ謇ｿ隱阪☆繧句�ｴ蜷医�縲∵ｬ｡縺ｮ繧医≧縺ｫ縺励※驕ｸ謚槭〒縺阪∪縺�:

% git cherry-pick 0c24b290ae02b2ab3304f51d5e11e85eb3659eae

縺ｾ縺溘�縲∝ｿ�ｦ√↓蠢懊§縺ｦ繝悶Λ繝ｳ繝∝�菴薙ｒ繝槭�繧ｸ縺吶ｋ縺薙→繧ゅ〒縺阪∪縺�:

% git merge avar/orange

縺昴＠縺ｦ縲√Μ繝昴ず繝医Μ縺ｫ繝励ャ繧ｷ繝･繝舌ャ繧ｯ縺励∪縺�:

% git push origin blead

Using a smoke-me branch to test changes

(螟画峩繧偵ユ繧ｹ繝医☆繧九◆繧√↓ smoke-me 繝悶Λ繝ｳ繝√ｒ菴ｿ縺�)

譎ゅ���√≠繧句､画峩縺後≠縺ｪ縺溘′逶ｴ謗･蛻ｩ逕ｨ縺ｧ縺阪↑縺� OS 縺ｫ髢｢縺吶ｋ繝�せ繝医〒縺阪↑縺� 繧ｳ繝ｼ繝峨ヱ繧ｹ縺ｫ蠖ｱ髻ｿ縺吶ｋ縺薙→縺後≠繧九�縺ｧ縲� blead 縺ｫ繧ｳ繝溘ャ繝医☆繧句燕縺ｫ莉悶� OS 縺ｮ繝ｦ繝ｼ繧ｶ繝ｼ縺悟､画峩繧偵ユ繧ｹ繝医＠縺ｦ繧ゅｉ縺��縺� 雉｢譏弱〒縺吶��

蟷ｸ縺��∵ｧ倥��↑ OS 縺ｧ縺ゅ↑縺溘�螟画峩繧偵せ繝｢繝ｼ繧ｯ繝�せ繝医☆繧区婿豕輔′縺ゅｊ縺ｾ縺�: 縺薙ｌ繧� "smoke-me" 繝悶Λ繝ｳ繝√→縺励※繝励ャ繧ｷ繝･縺励※縲√＞縺上▽縺九�閾ｪ蜍� smoke-testers 縺悟ｽｼ繧峨� OS 縺九ｉ縺ｮ邨先棡繧貞�ｱ蜻翫☆繧九�繧貞ｾ�■縺ｾ縺吶�� "smoke-me" 繝悶Λ繝ｳ繝√�繝悶Λ繝ｳ繝∝錐縺ｫ繧医▲縺ｦ隴伜挨縺輔ｌ縺ｾ縺�: 迚ｹ縺ｫ縲｝erl5.git.perl.org 縺ｧ隕九ｉ繧後ｋ繧医≧縺ｫ縲∝錐蜑阪�譛�蛻昴�驛ｨ蛻�′豁｣遒ｺ縺ｫ smoke-me 縺ｧ縺ゅｋ繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√〒縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�

縺薙ｌ繧偵☆繧九◆繧√�謇矩���螟ｧ縺ｾ縺九↓谺｡縺ｮ繧医≧縺ｪ繧ゅ�縺ｧ縺� (tonyc 縺ｫ繧医ｋ win32stat 縺ｨ蜻ｼ縺ｰ繧後ｋ smoke-me 繝悶Λ繝ｳ繝√�萓九ｒ菴ｿ縺�∪縺�):

縺ｾ縺壹�√Ο繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√ｒ菴懊▲縺ｦ縺昴ｌ縺ｫ蛻�ｊ譖ｿ縺医∪縺�:

% git checkout -b win32stat

螟画峩繧定｡後＞縲｝erl 繧偵ン繝ｫ繝峨＠縺ｦ螟画峩繧偵ユ繧ｹ繝医＠縲√Ο繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√↓ 繧ｳ繝溘ャ繝医＠縺ｾ縺吶�� 縺昴ｌ縺九ｉ繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√ｒ繝ｪ繝｢繝ｼ繝医� smoke-me 繝悶Λ繝ｳ繝√↓繝励ャ繧ｷ繝･縺励∪縺�:

% git push origin win32stat:smoke-me/tonyc/win32stat

縺薙％縺ｧ繝ｭ繝ｼ繧ｫ繝ｫ縺ｮ blead 縺ｫ謌ｻ縺励∪縺�:

% git checkout blead

縺昴＠縺ｦ莉悶�菴懈･ｭ繧偵＠縺ｦ謨ｰ譌･蠕�■縲《moke-me 繝悶Λ繝ｳ繝√↓蟇ｾ縺吶ｋ蝣ｱ蜻翫＆繧後ｋ邨先棡 http://perl.develop-help.com/?b=smoke-me/tonyc/win32state 繧呈ｳｨ隕悶＠縺ｾ縺吶��

蜈ｨ縺ｦ縺後≧縺ｾ縺上＞縺｣縺ｦ縺�ｌ縺ｰ縲∵焔蜈�� blead 繝悶Λ繝ｳ繝√ｒ譖ｴ譁ｰ縺励∪縺�:

% git pull

縺昴ｌ縺九ｉ繧ゅ≧荳�蠎ｦ謇句�縺ｮ smoke-me 繝悶Λ繝ｳ繝√ｒ繝√ぉ繝�け繧｢繧ｦ繝医＠縺ｦ縲� 縺昴ｌ繧� blead 縺ｫ繝ｪ繝吶�繧ｹ縺励∪縺�:

% git rebase blead win32stat

縺薙％縺ｧ blead 縺ｫ謌ｻ縺励※縲《moke-me 繝悶Λ繝ｳ繝√ｒ繝槭�繧ｸ縺励∪縺�:

% git checkout blead
% git merge win32stat

蜑崎ｿｰ縺励◆繧医≧縺ｫ縲《moke-me 繝悶Λ繝ｳ繝√↓螟壹￥縺ｮ螟画峩縺後≠繧句�ｴ蜷医�縲� 蜑崎ｿｰ縺ｮ譛�蠕後�繧ｳ繝槭Φ繝峨�莉｣繧上ｊ縺ｫ谺｡縺ｮ繧ｳ繝槭Φ繝峨ｒ菴ｿ縺�％縺ｨ縺ｧ縲� 縺薙ｌ繧峨�螟画峩縺ｮ讎りｦ√ｒ險倬鹸縺吶ｋ縺溘ａ縺ｮ繝槭�繧ｸ繧ｳ繝溘ャ繝医ｒ貅門ｙ縺吶ｋ縺ｹ縺阪〒縺�:

% git merge win32stat --no-ff --no-commit

縺薙％縺ｧ perl 繧偵ン繝ｫ繝峨＠縺ｦ縲√＞縺､繧ゅ�繧医≧縺ｫ螟画峩繧偵�繝�す繝･縺吶ｋ蜑阪↓縲� 縺ゅ↑縺溘�(繝槭�繧ｸ縺輔ｌ縺�)螟画峩繧呈怙蠕後↓繧ゅ≧荳�蠎ｦ繝�せ繝医☆繧九∋縺阪〒縺� (逅�Φ逧�↓縺ｯ縲√ユ繧ｹ繝医せ繧､繝ｼ繝亥�菴薙ｒ螳溯｡後＠縺ｾ縺�; 縺励°縺励�� 蟆代↑縺上→繧� t/porting/*.t 繝�せ繝医ｒ螳溯｡後＠縺ｾ縺�) 縲�

% git push origin blead

譛�蠕後↓縲√Μ繝｢繝ｼ繝医� smoke-me 繝悶Λ繝ｳ繝√ｒ蜑企勁縺励※:

% git push origin :smoke-me/tonyc/win32stat

(縺薙ｌ縺ｯ縺翫◎繧峨￥谺｡縺ｮ繧医≧縺ｪ隴ｦ蜻翫ｒ蜃ｺ縺励∪縺吶′縲∫┌隕悶〒縺阪∪縺�:

remote: fatal: ambiguous argument
                                 'refs/heads/smoke-me/tonyc/win32stat':
unknown revision or path not in the working tree.
remote: Use '--' to separate paths from revisions

) 縺昴＠縺ｦ繝ｭ繝ｼ繧ｫ繝ｫ繝悶Λ繝ｳ繝√ｒ蜑企勁縺励∪縺�:

% git branch -d win32stat

A note on camel and dromedary

(camel 縺ｨ dromedary 縺ｫ髢｢縺吶ｋ豕ｨ諢�)

繧ｳ繝溘ャ繧ｿ縺ｯ縲�perl5.git.perl.org 縺ｫ繧ｵ繝ｼ繝薙せ繧呈署萓帙☆繧倶ｺ後▽縺ｮ 繧ｵ繝ｼ繝舌↓繧｢繧ｯ繧ｻ繧ｹ縺ｧ縺阪∪縺吶�� perl5.git.perl.org 閾ｪ霄ｫ (camel) 縺ｧ縲� 縺薙ｌ縺後�後�繧ｹ繧ｿ繝ｼ縲阪Μ繝昴ず繝医Μ縺ｧ縺吶�� 莠後▽逶ｮ縺ｯ users.perl5.git.perl.org (dromedary) 縺ｧ縲� 荳�闊ｬ逧�↑繝�せ繝医→髢狗匱縺ｫ菴ｿ逕ｨ縺ｧ縺阪∪縺吶�� dromedary 縺ｯ謨ｰ蛻�＃縺ｨ縺ｫ camel 縺九ｉ git 繝�Μ繝ｼ繧貞酔譛溘☆繧九�縺ｧ縲√◎縺薙↓ 繝励ャ繧ｷ繝･縺励※縺ｯ縺�￠縺ｾ縺帙ｓ縲� 荳｡譁ｹ縺ｮ繝槭す繝ｳ縺ｫ縺ｯ /srv/CPAN 縺ｫ螳悟�縺ｪ CPAN 繝溘Λ繝ｼ繧ゅ≠繧九�縺ｧ縲� 縺薙ｌ繧剃ｽｿ縺｣縺ｦ縺上□縺輔＞縲� dromedary 縺ｯ繝輔ぃ繧､繝ｫ繧剃ｸ�闊ｬ蜈ｬ髢九☆繧九◆繧√↓縲� ~/public_html/ 繧� http://users.perl5.git.perl.org/~yourlogin/ 縺ｨ縺励※謠蝉ｾ帙＠縺ｦ縺�∪縺吶��

縺薙ｌ繧峨�繝帙せ繝医�縲∝､夜Κ縺ｫ蟇ｾ縺励※縺九↑繧雁宍譬ｼ縺ｪ繝輔ぃ繧､繧｢繧ｦ繧ｩ繝ｼ繝ｫ繧呈戟縺｣縺ｦ縺�∪縺吶�� 騾∽ｿ｡縺ｯ rsync縲《sh縲“it 縺�縺代′險ｱ蜿ｯ縺輔ｌ縺ｦ縺�∪縺吶�� http 縺ｨ ftp 縺ｫ蟇ｾ縺励※縺ｯ縲√�繝ｭ繧ｭ繧ｷ縺ｨ縺励※ http://webproxy:3128 繧� 菴ｿ逕ｨ縺ｧ縺阪∪縺吶�� 蜿嶺ｿ｡縺ｯ縲√ヵ繧｡繧､繧｢繧ｦ繧ｩ繝ｼ繝ｫ縺ｯ謾ｻ謦�ｒ讀懷�縺励�∫桝繧上＠縺�い繧ｯ繝�ぅ繝薙ユ繧｣繧呈戟縺､ IP 繧｢繝峨Ξ繧ｹ繧偵ヶ繝ｭ繝�け縺励ｈ縺�→縺励∪縺吶�� 縺薙ｌ縺ｯ譎ゅ↓(髱槫ｸｸ縺ｫ縺ｾ繧後↓)隱､讀懷�縺後≠繧翫�√ヶ繝ｭ繝�け縺輔ｌ繧句庄閭ｽ諤ｧ縺後≠繧翫∪縺吶�� 繝悶Ο繝�け繧定ｧ｣髯､縺吶ｋ譛�繧らｰ｡蜊倥↑譁ｹ豕輔�縲∫ｮ｡逅���↓騾夂衍縺吶ｋ縺薙→縺ｧ縺吶��

縺薙ｌ繧我ｺ後▽縺ｮ繝懊ャ繧ｯ繧ｹ縺ｯ縲｜ooking.com 縺ｫ繧医▲縺ｦ謇�譛峨＆繧後�√�繧ｹ繝医＆繧後�� 驕句霧縺輔ｌ縺ｦ縺�∪縺吶�� 繧ｷ繧ｹ繝�Β邂｡逅���↓縺ｯ縲（rc.perl.org 縺ｮ #p5p 縺九�� perl5-porters@perl.org 縺ｸ縺ｮ繝｡繝ｼ繝ｫ縺ｧ 騾｣邨｡縺ｧ縺阪∪縺吶��