Mercurial > hgbook
diff ja/cmdref.tex @ 291:504f23b4f625
started japanese translation
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Thu, 07 Feb 2008 15:52:15 +0900 |
parents | b0db5adf11c1 |
children | f72e4be6dd37 |
line wrap: on
line diff
--- a/ja/cmdref.tex Wed Feb 06 17:43:11 2008 +0900 +++ b/ja/cmdref.tex Thu Feb 07 15:52:15 2008 +0900 @@ -1,60 +1,92 @@ -\chapter{Command reference} +%\chapter{Command reference} +\chapter{$B%3%^%s%I%j%U%!%l%s%9(B} \label{cmdref} -\cmdref{add}{add files at the next commit} +\cmdref{add}{$B<!2s$N%3%_%C%H$G%U%!%$%k$rDI2C(B} \optref{add}{I}{include} \optref{add}{X}{exclude} \optref{add}{n}{dry-run} -\cmdref{diff}{print changes in history or working directory} +\cmdref{diff}{$B%R%9%H%j$^$?$O%o!<%-%s%0%G%#%l%/%H%jFb$NJQ99$rI=<((B} -Show differences between revisions for the specified files or -directories, using the unified diff format. For a description of the -unified diff format, see section~\ref{sec:mq:patch}. +%Show differences between revisions for the specified files or +%directories, using the unified diff format. For a description of the +%unified diff format, see section~\ref{sec:mq:patch}. + +$B;XDj$7$?%U%!%$%k!"%G%#%l%/%H%j$K$D$$$F%j%S%8%g%s4V$G$N:9J,$rI=<($9$k!#(B +$BI=<($K$O(Bunified diff$B%U%)!<%^%C%H$,MQ$$$i$l$k!#(Bunified diff$B%U%)!<%^%C%H(B +$B$K$D$$$F$N@bL@$O(B\ref{sec:mq:patch}$B$r;2>H$N$3$H!#(B -By default, this command does not print diffs for files that Mercurial -considers to contain binary data. To control this behaviour, see the -\hgopt{diff}{-a} and \hgopt{diff}{--git} options. +%By default, this command does not print diffs for files that Mercurial +%considers to contain binary data. To control this behaviour, see the +%\hgopt{diff}{-a} and \hgopt{diff}{--git} options. -\subsection{Options} +$B%G%U%)%k%H$G$O%P%$%J%j%G!<%?$H9M$($i$l$k%U%!%$%k$N:9J,$O=PNO$7$J$$!%$3$N(B +$B5sF0$O(B\hgopt{diff}{-a} $B$H(B \hgopt{diff}{--git}$B$K$h$C$FJQ99$G$-$k!%(B + + +\subsection{$B%*%W%7%g%s(B} \loptref{diff}{nodates} -Omit date and time information when printing diff headers. +%Omit date and time information when printing diff headers. + +diff$B%X%C%@$+$iF|IU$H;~4V>pJs$r>JN,$9$k!%(B \optref{diff}{B}{ignore-blank-lines} -Do not print changes that only insert or delete blank lines. A line -that contains only whitespace is not considered blank. +%Do not print changes that only insert or delete blank lines. A line +%that contains only whitespace is not considered blank. + +$B6u9T$NA^F~$^$?$O:o=|$@$1$NJQ99$rI=<($7$J$$!%6uGrJ8;z$,4^$^$l$k9T$O6u9T$H(B +$B$O8+$J$5$l$J$$!%(B \optref{diff}{I}{include} -Include files and directories whose names match the given patterns. +%Include files and directories whose names match the given patterns. + +$B;XDj$7$?%Q%?!<%s$H%^%C%A$9$k%U%!%$%k$^$?$O%G%#%l%/%H%j$rBP>]$K2C$($k(B \optref{diff}{X}{exclude} -Exclude files and directories whose names match the given patterns. +%Exclude files and directories whose names match the given patterns. + +$B;XDj$7$?%Q%?!<%s$H%^%C%A$9$k%U%!%$%k$^$?$O%G%#%l%/%H%j$rBP>]$+$i=|30$9$k(B \optref{diff}{a}{text} -If this option is not specified, \hgcmd{diff} will refuse to print -diffs for files that it detects as binary. Specifying \hgopt{diff}{-a} -forces \hgcmd{diff} to treat all files as text, and generate diffs for -all of them. +%If this option is not specified, \hgcmd{diff} will refuse to print +%diffs for files that it detects as binary. Specifying \hgopt{diff}{-a} +%forces \hgcmd{diff} to treat all files as text, and generate diffs for +%all of them. -This option is useful for files that are ``mostly text'' but have a -few embedded NUL characters. If you use it on files that contain a -lot of binary data, its output will be incomprehensible. +$B$3$N%*%W%7%g%s$,;XDj$5$l$J$1$l$P(B\hgcmd{diff}$B$O%P%$%J%j$HH=Dj$5$l$?%U%!%$(B +$B%k$KBP$9$k(Bdiff$B$N@8@.$r9T$J$o$J$$!%(B\hgopt{diff}{-a}$B$r;XDj$9$k$H(B +\hgcmd{diff}$B$OA4$F$N%U%!%$%k$r%F%-%9%H$H$7$F07$$!$A4$F$N%U%!%$%k$KBP$7$F(B +diff$B$r@8@.$9$k!%(B + +%This option is useful for files that are ``mostly text'' but have a +%few embedded NUL characters. If you use it on files that contain a +%lot of binary data, its output will be incomprehensible. + +$B$3$N%*%W%7%g%s$O!$$[$\A4$F$,%F%-%9%H$@$,0lIt$K(BNUL$BJ8;z$r4^$s$G$$$k$h$&$J%U%!(B +$B%$%k$KBP$7$FM-MQ$G$"$k!%$3$N%*%W%7%g%s$r%P%$%J%j%G!<%?$,B?$/4^$^$l$k%U%!(B +$B%$%k$KE,MQ$9$k$HL50UL#$J=PNO$K$J$k$@$m$&!%(B \optref{diff}{b}{ignore-space-change} -Do not print a line if the only change to that line is in the amount -of white space it contains. +%Do not print a line if the only change to that line is in the amount +%of white space it contains. + +$B6uGr$NJQ99$N$_$N9T$K$D$$$F=PNO$7$J$$!%(B \optref{diff}{g}{git} -Print \command{git}-compatible diffs. XXX reference a format -description. +%Print \command{git}-compatible diffs. XXX reference a format +%description. + +\command{git}$B8_49$N(Bdiff$B$r=PNO$9$k!%(B + \optref{diff}{p}{show-function}