* Re: git svn branch tracking + ignore paths
From: Avery Pennarun @ 2009-10-28 16:00 UTC (permalink / raw)
To: Lachlan Deck; +Cc: git list
In-Reply-To: <19979334-07EB-48CA-8E62-4ECC5E1FA51C@gmail.com>
On Wed, Oct 28, 2009 at 1:59 AM, Lachlan Deck <lachlan.deck@gmail.com> wrote:
> On 28/10/2009, at 4:20 PM, Avery Pennarun wrote:
>> So which are the files you don't want to import from trunk? It
>> doesn't sound like there are any... so it's getting simpler already.
>
> There are. I've currently (as a workaround) done the following within the
> main branch:
> add the following to .git/info/exclude
> .settings
> target
> .classpath
> .project
>
> The last two of these has no effect of course because .project and
> .classpath files already exist -- and thus are marked as modified. So I'm
> currently doing a git stash && git svn rebase && git svn dcommit && git
> stash pop
>
> I'm also wanting to exclude 'lib' folders from trunk (as these are not
> needed).
The problem is that as your branch diverges from what you *actually*
want to commit, it becomes exponentially more complicated to figure
out what you *do* want to commit.
Note that if you're planning to share your git project with other
people anyway, then you have an additional problem: you're using git
svn rebase, which is almost useless for sharing with other people
(other than through svn, of course), for the same reason any git
rebase is.
One option you have is to maintain two branches:
1. (git-svn) The git-svn trunk, which contains only stuff you want upstream
2. (master) Your live branch, which contains everything from (1) plus
your local customizations.
When you want to fetch from svn, you do this:
git checkout master
git svn fetch git-svn
git merge git-svn
When you want to push to svn, you do this:
git checkout git-svn
git merge --squash --no-commit master
(now undo your local customizations)
git commit
git svn dcommit
git checkout master
git merge git-svn
Note that master never gets rebased, only merged. If you can write a
simple script for "undo your local customizations" - such as reverting
a particular commit, for example - then you can put the above in a
shell script and it should work fine most of the time.
Good luck.
Avery
^ permalink raw reply
* Re: From 200 to 404 to 407.
From: Avery Pennarun @ 2009-10-28 15:50 UTC (permalink / raw)
To: Peter Odéus; +Cc: git
In-Reply-To: <82fd2c5d0910280138r52baff98p3f4ff65e968b0d37@mail.gmail.com>
On Wed, Oct 28, 2009 at 4:38 AM, Peter Odéus <peter.odeus@gmail.com> wrote:
> * Re-using existing connection! (#0) with host proxyserver.acme.com
> * Connected to proxyserver.acme.com (192.71.145.9) port 8080
> > GET http://gitrepo.outside.com/git/gitrepo.git/objects/6b/132a9e81161e58812902d7f735a38bf5ee1583 HTTP/1.1
> Proxy-Authorization: Basic cmQva3F3Zzc2MjptYW1tYW1pYQ==
> User-Agent: git/1.6.5.2
> Host: gitrepo.outside.com
> Accept: */*
>
> * The requested URL returned error: 404
So this git object didn't exist, apparently. Can you confirm that the
object shouldn't be there? (on the server: git cat-file -p
6b132a9e81161e58812902d7f735a38bf5ee1583) Does git-fsck report
anything weird on the server repository?
> * Closing connection #0
> * Couldn't find host gitrepo.outside.com in the .netrc file, using defaults
> * About to connect() to proxyserver.acme.com port 8080
> * Trying 192.71.145.9... * connected
> * Connected to proxyserver.acme.com (192.71.145.9) port 8080
> > GET http://gitrepo.outside.com/git/gitrepo.git/objects/info/http-alternates HTTP/1.1
> User-Agent: git/1.6.5.2
> Host: gitrepo.outside.com
> Accept: */*
> Pragma: no-cache
>
> < HTTP/1.1 407 Proxy Authentication Required ( The ISA Server requires
> authorization to fulfill the request. Access to the Web Proxy service
> is denied. )
This error seems to happen because the Proxy-Authorization line was
not included in this request like it was included in prior ones.
Probably the authorization key was forgotten when the first connection
closed. If there hadn't been a 404, the connection wouldn't have
closed and this wouldn't have happened, which is presumably why you
haven't seen this problem before.
This is where my expertise ends, since I've never messed with either
libcurl or git's usage of it. I couldn't tell you if this is a
libcurl bug or a git bug. (Proxies are relatively rare nowadays, so
this code path is likely to be rarely tested.)
Hopefully someone else on the list can assist.
** WARNING: the username/password sent in the Proxy-Authorization line
is not encrypted and you've posted a trace of it to a public mailing
list. You need to change your password immediately. **
Good luck,
Avery
^ permalink raw reply
* Re: merge confusion
From: Alex Riesen @ 2009-10-28 15:43 UTC (permalink / raw)
To: Tim Mazid; +Cc: git
In-Reply-To: <26093419.post@talk.nabble.com>
On Wed, Oct 28, 2009 at 13:01, Tim Mazid <timmazid@hotmail.com> wrote:
> You can just do a 'git branch branch-to-merge COMMIT' then 'git merge
> branch-to-merge' from your feature branch. Alternatively, you could just do
> a straight 'git merge COMMIT' from your feature branch. Though I'm not sure
> of the consequences of merging a commit instead of a branch.
The only consequence is that the merge commit message (if there will be any,
fast-forward merges don't merge anything) will mention the SHA1 instead of
branch name. You can provide your own merge commit message, of course
(while merging and afterwards).
^ permalink raw reply
* Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option
From: Scott Chacon @ 2009-10-28 15:37 UTC (permalink / raw)
To: David Aguilar; +Cc: Charles Bailey, git list, Junio C Hamano
In-Reply-To: <20091028090022.GA90780@gmail.com>
Hey,
On Wed, Oct 28, 2009 at 2:00 AM, David Aguilar <davvid@gmail.com> wrote:
>> I'm just wondering, does this work well with unixes and Mac OS X? I
>> think it's recommended install practice to symlink p4v as p4merge on
>> *nix, but Mac OS X needs some sort of 'launchp4merge' to be called
>> IIRC, or is this something that users can just configure with
>> mergetool.p4diff.path?
>
> I just tested this on Mac OS X with the latest version of
> p4merge. It worked great.
>
> $ git config difftool.p4merge.path \
> /Applications/p4merge.app/Contents/MacOS/p4merge
>
> $ git difftool -t p4merge HEAD^
>
This is how I have it setup as well and both diff and merge work for
me. I had to do a weird thing with passing it $LOCAL twice if there
was no merge base since otherwise it does a diff tool instead of a
merge tool - the difference is based on the number of arguments, but
it seems to work pretty well. I can try it on Linux a bit later, but
I'm not sure why launchp4merge would be needed instead of setting the
path like this on a Mac - if there is no serious objection, I can
resend this with my Signed-Off-By (sorry, I forgot).
Thanks,
Scott
^ permalink raw reply
* Re: From 200 to 404 to 407.
From: Peter Odéus @ 2009-10-28 15:35 UTC (permalink / raw)
To: git
In-Reply-To: <loom.20091028T160202-594@post.gmane.org>
Peter <peter.odeus <at> gmail.com> writes:
>
>
> Don't have root access at work == no wireshark.
>
>
I have tried to attach rich console output (thanks to env variable
GIT_CURL_VERBOSE=1) into a gmane-follow-up-message.
No dice.
Are there restrictions on what characters are permitted?
^ permalink raw reply
* Re: how to split a hunk
From: bill lam @ 2009-10-28 15:26 UTC (permalink / raw)
To: Geert Bosch; +Cc: git
In-Reply-To: <21963906-785A-4D98-8AD8-A89ED914920C@adacore.com>
On Tue, 27 Oct 2009, Geert Bosch wrote:
> I like to use "git gui" for this. This allows you to pick individual
> lines to commit. I really like the "git gui" interface for staging/unstaging
> changes and making a series of commits.
Thank you suggestion. However I did not use git-gui/gitk or have tcl
installed.
--
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
^ permalink raw reply
* packaging vs default pager
From: Ben Walton @ 2009-10-28 15:21 UTC (permalink / raw)
To: GIT List
[-- Attachment #1: Type: text/plain, Size: 999 bytes --]
Hi All,
I'd like to see what people think about providing a configure/Makefile
knob for overriding the default pager at build time. Currently,
things use 'less' as the fallback and rely on the path to find
it.
On (old) solaris systems, /usr/bin/less (typically the first less
found) doesn't understand the default arguments (FXRS), which forces
users to alter their environment (PATH, GIT_PAGER, LESS, etc) or have
a local or global gitconfig before paging works as expected.
Would it be completely out of line to provide a knob so that the
fallback $pager could be set to something more specific/appropriate
during the build? [I'll do the work but not if it's an undesirable
addition.]
Alternately, are packagers recommended to simply ship a global
gitconfig that sets core.pager?
Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302
GPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu
Contact me to arrange for a CAcert assurance meeting.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: how to split a hunk
From: bill lam @ 2009-10-28 15:16 UTC (permalink / raw)
To: Thomas Rast; +Cc: git
In-Reply-To: <200910281406.12923.trast@student.ethz.ch>
On Wed, 28 Oct 2009, Thomas Rast wrote:
> There's also the 'git add -p' [e]dit feature, which pops up the patch
> in an editor. There are instructions in that file, but in this case,
> you can simply remove one of the additions.
Thank you for pointing out the [e], incidentally after trying it, I
also noticed and tried the add -e which belongs to a similar format.
--
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
^ permalink raw reply
* Re: From 200 to 404 to 407.
From: Peter @ 2009-10-28 15:02 UTC (permalink / raw)
To: git
In-Reply-To: <32541b130910270953w6bd35ddctd471e682830b8f62@mail.gmail.com>
Don't have root access at work == no wireshark.
^ permalink raw reply
* Re: sp/smart-http topic
From: Shawn O. Pearce @ 2009-10-28 14:47 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7veiovly35.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
>
> * sp/smart-http (2009-10-14) 17 commits
> - Smart fetch over HTTP: client side
...
> What's the doneness of this series?
Not done yet. I want to respin once more before it hits next.
I've picked up a number of test related changes from Clemens
Buchacher and Tay Ray Chuan, plus some suggestions from the latter
were fixed up in the WebDAV code.
John "warthog9" Hawley and I were spending some time yesterday to
try to figure out why smart HTTP serving off kernel.org was giving
me only 300 KiB/sec during clone, but git-daemon was giving me 12
MiB/sec for the same server and repository.
Peff noticed the TCP windows for smart HTTP were ~16 KiB in size,
but with git-daemon were ~200 KiB on size. John and I are pretty
sure this is the throughput problem, but we haven't found why the
window is so much smaller under smart HTTP.
We also need proper tests for smart HTTP. I haven't had time to
write tests yet, and the ones that were proposed for t5540-http-push
aren't suitable because you have to run the test suite twice in
order to test both WebDAV and smart HTTP push for the same build.
--
Shawn.
^ permalink raw reply
* Re: possible usability issue in rebase -i?
From: Erik Faye-Lund @ 2009-10-28 14:41 UTC (permalink / raw)
To: Baz; +Cc: Git Mailing List
In-Reply-To: <2faad3050910280734l7297c30erfb0a47b12b0bd07d@mail.gmail.com>
On Wed, Oct 28, 2009 at 3:34 PM, Baz <brian.ewins@gmail.com> wrote:
> 2009/10/28 Erik Faye-Lund <kusmabite@googlemail.com>:
>> I'm not sure I follow - aren't dashless options, uhm, dashless? Do you
>> mean to use the long-form instead of the short-form? I'll assume
>> that's what you mean for now, since you changed "-i" to "--interactive
>> | -i".
>
> No, I just meant 'git rebase' not 'git-rebase'. Sorry, I changed a
> couple of things at once.
Ah, didn't notice that one. I completely agree with you on this.
> tend to emit one-liners. As for calling out 'interactive', at the
> other extreme its not clear to me why we mention '-i' separately from
> '[options]' at all. rebase is already pretty inconsistent here, giving
> short or long usage messages depending on whether you passed '-i'. But
> I'll take comments on this when I submit the patch, I've no strong
> feelings on it.
It's a simple reason why the output is different - this is the usage
for "git rebase -i" (hence it is in git-rebase--interactive.sh). I
guess this distinction would be slightly clearer if we removed the
brackets from the usage like this:
-git-rebase [-i] [whatever]
+git-rebase -i [whatever]
--
Erik "kusma" Faye-Lund
^ permalink raw reply
* Re: possible usability issue in rebase -i?
From: Baz @ 2009-10-28 14:34 UTC (permalink / raw)
To: kusmabite; +Cc: Git Mailing List
In-Reply-To: <40aa078e0910280520t497f1289sf374a3a501856a23@mail.gmail.com>
2009/10/28 Erik Faye-Lund <kusmabite@googlemail.com>:
> On Tue, Oct 27, 2009 at 10:05 PM, Baz <brian.ewins@gmail.com> wrote:
>> I'm fine with this way of fixing it, but I'd make a few more changes...
>
> Feel free to make a patch-series that addresses more issues - I'm not going to.
>
Yep, I wrote one but had to leave the house before sending it. Later today.
> We make patches of one change at the time in Git. Other (related)
> usability issues becomes separate patches, preferably grouped together
> in a patch-series. This change would be one patch in such a series.
>
>>> OPTIONS_SPEC="\
>>> git-rebase [-i] [options] [--] <upstream> [<branch>]
>>
>> Use the dashless form and be more consistent with the help - and
>> mention '--root' here, it appears in the
>> help below:
>>
>> -git-rebase [-i] [options] [--] <upstream> [<branch>]
>> +git rebase [--interactive | -i] [options] [--onto <newbase>] [--]
>> <upstream> [<branch>]
>> +git rebase [--interactive | -i] [options] --onto <newbase> --root
>> [--] [<branch>]
>>
>
> I'm not sure I follow - aren't dashless options, uhm, dashless? Do you
> mean to use the long-form instead of the short-form? I'll assume
> that's what you mean for now, since you changed "-i" to "--interactive
> | -i".
No, I just meant 'git rebase' not 'git-rebase'. Sorry, I changed a
couple of things at once.
>
> If so, I'm not 100% convinced it's a clear win: some grep'ing
> indicates that both the short and long form are both widely used, with
> short-option bein a slight favor:
> $ git grep " \[--" | grep -v " \[--\]" | wc -l
> 228
> $ git grep " \[-[^-]" | wc -l
> 243
>
> Also, the usage isn't the only documentation. I think it makes sense
> to try to keep the usage short and to the point, there's a list
> describing each option (showing the full-name) further down in the
> usage-message. And if that's not enough, there's the "git
> help"-command.
>
> If I've misunderstood you and you only want the usage-string to match
> that of the manpage, perhaps that might be a good idea. I dunno.
In the patch I've followed other uses of OPTIONS_SPEC; they're quite
verbose, covering all options, while scripts using USAGE/LONG_USAGE
tend to emit one-liners. As for calling out 'interactive', at the
other extreme its not clear to me why we mention '-i' separately from
'[options]' at all. rebase is already pretty inconsistent here, giving
short or long usage messages depending on whether you passed '-i'. But
I'll take comments on this when I submit the patch, I've no strong
feelings on it.
>
>>
>>> -git-rebase [-i] (--continue | --abort | --skip)
>>> +git-rebase [-i] [-m] (--continue | --abort | --skip)
>>
>> Again, dashless. And I'd not mention the useless -i here, the man page
>> doesn't either:
>>
>> -git-rebase [-i] (--continue | --abort | --skip)
>> +git rebase (--continue | --abort | --skip)
>>
>
> It was already there, so I didn't consider it, but I guess it makes
> sense. Besides, I aimed at not loosing any information while making it
> a bit clearer.
>
>> These two items are misplaced in the help (I think). They're not like
>> abort, continue, skip, but then, the man page doesn't group those
>> separately either.
>>
>> +no-verify override pre-rebase hook from stopping the operation
>> +root rebase all reachable commmits up to the root(s)
>>
>
> Agree.
>
>>> Actions:
>>> continue continue rebasing process
>>> abort abort rebasing process and restore original branch
>>
>> As above, remove the next two lines after your patch:
>>
>> -no-verify override pre-rebase hook from stopping the operation
>> -root rebase all reachable commmits up to the root(s)
>
> I don't follow this. Are you repeating yourself now? :)
Yes :) ... was just finishing off moving those two lines.
Cheers,
Baz
>
> --
> Erik "kusma" Faye-Lund
>
^ permalink raw reply
* Re: [PATCH] bash completion: difftool accepts the same options as diff
From: Shawn O. Pearce @ 2009-10-28 14:32 UTC (permalink / raw)
To: Markus Heidelberg; +Cc: Junio C Hamano, git, David Aguilar
In-Reply-To: <1256723138-1480-1-git-send-email-markus.heidelberg@web.de>
Markus Heidelberg <markus.heidelberg@web.de> wrote:
> So complete refs, files after the doubledash and some diff options that
> make sense for difftool.
>
> Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
> contrib/completion/git-completion.bash | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
--
Shawn.
^ permalink raw reply
* Re: [PATCH] commit: More generous accepting of RFC-2822 footer lines.
From: David Brown @ 2009-10-28 14:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Shawn O. Pearce, David Brown, git@vger.kernel.org
In-Reply-To: <7vk4yguh00.fsf@alter.siamese.dyndns.org>
On Wed, Oct 28, 2009 at 12:14:55AM -0700, Junio C Hamano wrote:
> When deciding to omit adding a new S-o-b, we deliberately check only the
> last S-o-b to see if it matches what we are trying to add. This is so
> that a message from you, that has my patch that was reviewed and touched
> up by you with your sign-off, i.e.
This is good to know. I'll leave the existing last-SoB test in
place then, and just use the sophisticated check for a block of
RFC2822 footers to determine if there should be a blank line.
Jeff also pointed out that I should probably also allow lines
starting with whitespace to be considered header lines.
David
^ permalink raw reply
* Re: [PATCH] imap-send.c: fix pointer to be const
From: Michael J Gruber @ 2009-10-28 13:33 UTC (permalink / raw)
To: Vietor Liu; +Cc: Junio C Hamano, git
In-Reply-To: <1256713526.3333.0.camel@localhost.localdomain>
Vietor Liu venit, vidit, dixit 28.10.2009 08:05:
> On Tue, 2009-10-27 at 23:26 -0700, Junio C Hamano wrote:
>> Vietor Liu <vietor@vxwo.org> writes:
>>
>>> Fixes some compiler warnings:
>>> imap-send.c: In function ‘ssl_socket_connect’:
>>> warning: assignment discards qualifiers from pointer target type
>>>
>>> Signed-off-by: Vietor Liu <vietor@vxwo.org>
>>
>> I do not quite understand. This variable gets assigned the return values
>> from TLSv1_method() or SSLv23_method(), but the copy of ssl.h I have
>> declares them as:
>>
>> SSL_METHOD *SSLv23_method(void); /* SSLv3 but can rollback to v2 */
>> SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */
>
> 1. openssl-devel-1.0.0-0.10
>
> const SSL_METHOD *SSLv23_method(void); /* SSLv3 but can rollback to v2
> */
> const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */
>
>
> 2. http://www.openssl.org/docs/ssl/ssl.html
>
> const SSL_METHOD *SSLv2_method(void);
>
> Constructor for the SSLv2 SSL_METHOD structure for combined
> client and server.
> const SSL_METHOD *TLSv1_method(void);
>
> Constructor for the TLSv1 SSL_METHOD structure for combined
> client and server.
>
> 3. it maybe fixes warnings for other version.
No const here with openssl 0.9.8k. I think major distros will switch to
1.0.0 with their next major release (e.g. Fedora 12 will have it by the
end of this year).
Since this is only about warnings, maybe git 1.7.0 is the right time
frame to adjust this to the upcoming standard?
Michael
^ permalink raw reply
* Re: how to split a hunk
From: Thomas Rast @ 2009-10-28 13:06 UTC (permalink / raw)
To: bill lam; +Cc: git
In-Reply-To: <20091028022105.GE3938@debian.b2j>
bill lam wrote:
> There are occasions where diff of a file is
>
> - aaaa
> + bbbb
> + cccc
>
> I want to add lines bbbb and cccc as separated commits, but git-add -p
> seem cannot further split this hunk. Do I have no choice but to edit
> it by hand and commit the bbbb and then edit the file to add back the
> cccc?
There's also the 'git add -p' [e]dit feature, which pops up the patch
in an editor. There are instructions in that file, but in this case,
you can simply remove one of the additions.
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply
* [PATCH 1/3] t4034-diff-words: add a test for word diff without context
From: Markus Heidelberg @ 2009-10-28 12:24 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Johannes Schindelin, Markus Heidelberg
In-Reply-To: <1256732672-11817-1-git-send-email-markus.heidelberg@web.de>
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
t/t4034-diff-words.sh | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 4508eff..82240cf 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -68,6 +68,26 @@ cat > expect <<\EOF
<WHITE>index 330b04f..5ed8eff 100644<RESET>
<WHITE>--- a/pre<RESET>
<WHITE>+++ b/post<RESET>
+<BROWN>@@ -1 +1 @@<RESET>
+<RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
+<BROWN>@@ -3,0 +4,4 @@ a = b + c<RESET>
+
+<GREEN>aa = a<RESET>
+
+<GREEN>aeff = aeff * ( aaa )<RESET>
+EOF
+
+test_expect_failure 'word diff without context' '
+
+ word_diff --color-words --unified=0
+
+'
+
+cat > expect <<\EOF
+<WHITE>diff --git a/pre b/post<RESET>
+<WHITE>index 330b04f..5ed8eff 100644<RESET>
+<WHITE>--- a/pre<RESET>
+<WHITE>+++ b/post<RESET>
<BROWN>@@ -1,3 +1,7 @@<RESET>
h(4),<GREEN>hh<RESET>[44]
<RESET>
--
1.6.5.2.86.g61663
^ permalink raw reply related
* [PATCH 0/3] fix "git diff --color-words -U0"
From: Markus Heidelberg @ 2009-10-28 12:24 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Johannes Schindelin, Markus Heidelberg
The wrong output roughly is as follows:
@@ -a,b +c,d @@
@@ -e,f +g,h @@
some red, green and black text
more red, green and black text
When it should be:
@@ -a,b +c,d @@
some red, green and black text
@@ -e,f +g,h @@
more red, green and black text
Markus Heidelberg (3):
t4034-diff-words: add a test for word diff without context
diff: move the handling of the hunk header after the changed lines
diff: fix the location of hunk headers for "git diff --color-words
-U0"
diff.c | 40 +++++++++++++++++++++++-----------------
t/t4034-diff-words.sh | 20 ++++++++++++++++++++
2 files changed, 43 insertions(+), 17 deletions(-)
^ permalink raw reply
* [PATCH 2/3] diff: move the handling of the hunk header after the changed lines
From: Markus Heidelberg @ 2009-10-28 12:24 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Johannes Schindelin, Markus Heidelberg
In-Reply-To: <1256732672-11817-1-git-send-email-markus.heidelberg@web.de>
In preparation for a special case handling of colored word diff without
context.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
diff.c | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/diff.c b/diff.c
index b0c7e61..067e5a0 100644
--- a/diff.c
+++ b/diff.c
@@ -771,17 +771,6 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
len = 1;
}
- if (line[0] == '@') {
- len = sane_truncate_line(ecbdata, line, len);
- find_lno(line, ecbdata);
- emit_line(ecbdata->file,
- diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO),
- reset, line, len);
- if (line[len-1] != '\n')
- putc('\n', ecbdata->file);
- return;
- }
-
if (len < 1) {
emit_line(ecbdata->file, reset, reset, line, len);
return;
@@ -796,17 +785,18 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
diff_words_append(line, len,
&ecbdata->diff_words->plus);
return;
+ } else if (line[0] == ' ') {
+ if (ecbdata->diff_words->minus.text.size ||
+ ecbdata->diff_words->plus.text.size)
+ diff_words_show(ecbdata->diff_words);
+ line++;
+ len--;
+ emit_line(ecbdata->file, plain, reset, line, len);
+ return;
}
- if (ecbdata->diff_words->minus.text.size ||
- ecbdata->diff_words->plus.text.size)
- diff_words_show(ecbdata->diff_words);
- line++;
- len--;
- emit_line(ecbdata->file, plain, reset, line, len);
- return;
}
- if (line[0] != '+') {
+ if (line[0] == ' ' || line[0] == '-') {
const char *color =
diff_get_color(ecbdata->color_diff,
line[0] == '-' ? DIFF_FILE_OLD : DIFF_PLAIN);
@@ -814,10 +804,21 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
if (line[0] == ' ')
ecbdata->lno_in_postimage++;
emit_line(ecbdata->file, color, reset, line, len);
- } else {
+ return;
+ } else if (line[0] == '+') {
ecbdata->lno_in_postimage++;
emit_add_line(reset, ecbdata, line + 1, len - 1);
+ return;
}
+
+ /* line[0] == '@' */
+ len = sane_truncate_line(ecbdata, line, len);
+ find_lno(line, ecbdata);
+ emit_line(ecbdata->file,
+ diff_get_color(ecbdata->color_diff, DIFF_FRAGINFO),
+ reset, line, len);
+ if (line[len-1] != '\n')
+ putc('\n', ecbdata->file);
}
static char *pprint_rename(const char *a, const char *b)
--
1.6.5.2.86.g61663
^ permalink raw reply related
* [PATCH 3/3] diff: fix the location of hunk headers for "git diff --color-words -U0"
From: Markus Heidelberg @ 2009-10-28 12:24 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Johannes Schindelin, Markus Heidelberg
In-Reply-To: <1256732672-11817-1-git-send-email-markus.heidelberg@web.de>
Colored word diff without context lines firstly printed all the hunk
headers among each other and then printed the diff.
Because the word diff cannot be calculated before the end of the diff
(added/removed lines) hunk, it was calculated directly before first line
of context after the diff. But this didn't work if there was no context.
In this case the diff wasn't printed in fn_out_consume(), but entirely
in free_diff_words_data(). This also led to calculate the colored diff
from the whole diff in one swoop instead of calculating it in several
independent steps (one step per hunk).
We now calculate and print the word diff directly before the next hunk
header. The word diff of the last hunk is still printed in
free_diff_words_data().
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
diff.c | 13 +++++++++----
t/t4034-diff-words.sh | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index 067e5a0..e95fe9b 100644
--- a/diff.c
+++ b/diff.c
@@ -785,10 +785,15 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
diff_words_append(line, len,
&ecbdata->diff_words->plus);
return;
- } else if (line[0] == ' ') {
- if (ecbdata->diff_words->minus.text.size ||
- ecbdata->diff_words->plus.text.size)
- diff_words_show(ecbdata->diff_words);
+ }
+ /*
+ * If line[0] == '@' then this prints the content of the
+ * previous hunk, necessary for 0-context.
+ */
+ if (ecbdata->diff_words->minus.text.size ||
+ ecbdata->diff_words->plus.text.size)
+ diff_words_show(ecbdata->diff_words);
+ if (line[0] == ' ') {
line++;
len--;
emit_line(ecbdata->file, plain, reset, line, len);
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 82240cf..21db6e9 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -77,7 +77,7 @@ cat > expect <<\EOF
<GREEN>aeff = aeff * ( aaa )<RESET>
EOF
-test_expect_failure 'word diff without context' '
+test_expect_success 'word diff without context' '
word_diff --color-words --unified=0
--
1.6.5.2.86.g61663
^ permalink raw reply related
* Re: drawbacks to svn server + git-svn vs git server?
From: Matthieu Moy @ 2009-10-28 12:19 UTC (permalink / raw)
To: Dexter Riley; +Cc: git
In-Reply-To: <25994334.post@talk.nabble.com>
Dexter Riley <edbeaty@charter.net> writes:
> Hello. My group is currently using subversion on our version control server,
> but would like to move to git as a client. We are considering using
> git-svn, to avoid revalidating the server software. My question is, are
> there any major disadvantages to using git-svn versus git?
One rather big drawback is that "git svn dcommit" has to do some
history-rewritting. In other words, if you have a local commit A in
your repository, and send it to the SVN server with "git svn dcommit",
then A is rewritten into A' (same tree content, but different commit
message at least, and maybe other details I'm not aware of). If you
use git-svn as a "better SVN client", it's not a problem, but if you
want to really use the Git part of git-svn, then this history
rewritting will break the local branches that reference your A.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply
* Re: possible usability issue in rebase -i?
From: Erik Faye-Lund @ 2009-10-28 12:20 UTC (permalink / raw)
To: Baz; +Cc: Git Mailing List
In-Reply-To: <2faad3050910271405k4a391184vb978b9b35484383b@mail.gmail.com>
On Tue, Oct 27, 2009 at 10:05 PM, Baz <brian.ewins@gmail.com> wrote:
> I'm fine with this way of fixing it, but I'd make a few more changes...
Feel free to make a patch-series that addresses more issues - I'm not going to.
We make patches of one change at the time in Git. Other (related)
usability issues becomes separate patches, preferably grouped together
in a patch-series. This change would be one patch in such a series.
>> OPTIONS_SPEC="\
>> git-rebase [-i] [options] [--] <upstream> [<branch>]
>
> Use the dashless form and be more consistent with the help - and
> mention '--root' here, it appears in the
> help below:
>
> -git-rebase [-i] [options] [--] <upstream> [<branch>]
> +git rebase [--interactive | -i] [options] [--onto <newbase>] [--]
> <upstream> [<branch>]
> +git rebase [--interactive | -i] [options] --onto <newbase> --root
> [--] [<branch>]
>
I'm not sure I follow - aren't dashless options, uhm, dashless? Do you
mean to use the long-form instead of the short-form? I'll assume
that's what you mean for now, since you changed "-i" to "--interactive
| -i".
If so, I'm not 100% convinced it's a clear win: some grep'ing
indicates that both the short and long form are both widely used, with
short-option bein a slight favor:
$ git grep " \[--" | grep -v " \[--\]" | wc -l
228
$ git grep " \[-[^-]" | wc -l
243
Also, the usage isn't the only documentation. I think it makes sense
to try to keep the usage short and to the point, there's a list
describing each option (showing the full-name) further down in the
usage-message. And if that's not enough, there's the "git
help"-command.
If I've misunderstood you and you only want the usage-string to match
that of the manpage, perhaps that might be a good idea. I dunno.
>
>> -git-rebase [-i] (--continue | --abort | --skip)
>> +git-rebase [-i] [-m] (--continue | --abort | --skip)
>
> Again, dashless. And I'd not mention the useless -i here, the man page
> doesn't either:
>
> -git-rebase [-i] (--continue | --abort | --skip)
> +git rebase (--continue | --abort | --skip)
>
It was already there, so I didn't consider it, but I guess it makes
sense. Besides, I aimed at not loosing any information while making it
a bit clearer.
> These two items are misplaced in the help (I think). They're not like
> abort, continue, skip, but then, the man page doesn't group those
> separately either.
>
> +no-verify override pre-rebase hook from stopping the operation
> +root rebase all reachable commmits up to the root(s)
>
Agree.
>> Actions:
>> continue continue rebasing process
>> abort abort rebasing process and restore original branch
>
> As above, remove the next two lines after your patch:
>
> -no-verify override pre-rebase hook from stopping the operation
> -root rebase all reachable commmits up to the root(s)
I don't follow this. Are you repeating yourself now? :)
--
Erik "kusma" Faye-Lund
^ permalink raw reply
* Re: 2 projects 1 repo
From: Tim Mazid @ 2009-10-28 12:19 UTC (permalink / raw)
To: git
In-Reply-To: <25530063.post@talk.nabble.com>
twzgerald wrote:
>
> I have a client-server project where I split them into 2 projects to
> separately create the client in one software project and the server in
> another. I registered myself a project hosting at sourceforge.net which
> provides a git repository. How can I put the 2 projects into the git
> repository.
>
> I want to create some sort of hierarchy like <main-project>--> Client -->
> src --> org.project.client...etc..
>
> |
>
> +----------> Server --> src --> org.project.server...etc..
>
You could simply create two branches, master-server, and master-client, and
just never ever cross-merge them, or their child branches.
Or you just create two repos.
Good luck,
Tim.
--
View this message in context: http://www.nabble.com/2-projects-1-repo-tp25530063p26093640.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Tagging stable releases
From: Tim Mazid @ 2009-10-28 12:17 UTC (permalink / raw)
To: git
In-Reply-To: <23045562.post@talk.nabble.com>
Asaf wrote:
>
> Hello,
>
> I'm creating many branches, checkout code, make changes, etc..
> At the end, I always merge these branches to the master branch and delete
> them when I finish,
>
>
> At the point where my local master repo seems to be stable, I push the
> changes to an origin repo that is public.
>
>
> I guess this is a standard cycle, right?
>
You don't need to merge everything back into master or delete branches.
When you 'git push', it only pushes remote tracking branches. (Branches that
you fetched from that repo).
If you do 'git push --all', it will push all your branches to the repo.
If you do 'git push REMOTE-REPO BRANCH', it will push just that branch. You
can, of course, list multiple branches.
Asaf wrote:
>
> What I'm confused about is how to tag correctly versions that are stable,
> Should I locally just add a tag and push the tag to the public repo?
>
Yup.
Asaf wrote:
>
> Is it enough to use a lightweight tagging for tagging a certain commit as
> a release?
>
Yes, but signing it makes others feel more confident, and if you at least
annotate, you can provide some sort of description.
Asaf wrote:
>
> Is it possible later on to checkout a tag, make a change and push the
> change into the tagged version?
>
Once again, yup, just do 'git checkout TAG'. Though you may want to do 'git
checkout -b NEW-BRANCH TAG'.
Good luck,
Tim.
--
View this message in context: http://www.nabble.com/Tagging-stable-releases-tp23045562p26093620.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: [PATCH] gitk: Add Japanese translation
From: Mizar @ 2009-10-28 12:14 UTC (permalink / raw)
To: git, Paul Mackerras, Junio C Hamano
In-Reply-To: <d092a4360910261803q3a2dc0eeg8c1d5fc7aa04cd64@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 7558 bytes --]
Tentatively completed translation.
Please review whether there is a strange translation.
The changes are as follows.
| diff --git a/po/ja.po b/po/ja.po
| index 8bb2d2a..af423dd 100644
| --- a/po/ja.po
| +++ b/po/ja.po
| @@ -19,7 +19,7 @@ msgstr ""
|
| #: gitk:113
| msgid "Couldn't get list of unmerged files:"
| -msgstr "マージされていないファイルの一覧を取得できません:"
| +msgstr "マージされていないファイルのリストを取得できません:"
|
| #: gitk:269
| msgid "Error parsing revisions:"
| @@ -83,11 +83,11 @@ msgstr "リロード"
|
| #: gitk:1921
| msgid "Reread references"
| -msgstr "参照を再読み込み"
| +msgstr "リファレンスを再読み込み"
|
| #: gitk:1922
| msgid "List references"
| -msgstr "参照リストを表示"
| +msgstr "リファレンスリストを表示"
|
| #: gitk:1924
| msgid "Start git gui"
| @@ -335,9 +335,9 @@ msgstr ""
| "\n"
| "Gitk - gitコミットビューア\n"
| "\n"
| -"Copyright (c) 2005-2008 Paul Mackerras\n"
| +"Copyright © 2005-2008 Paul Mackerras\n"
| "\n"
| -"使用および再配布はGNU General Public License に従ってください"
| +"使用および再配布は GNU General Public License に従ってください"
|
| #: gitk:2665 gitk:2727 gitk:9005
| msgid "Close"
| @@ -514,7 +514,7 @@ msgstr "一時ディレクトリ %s 生成時エラー:"
| #: gitk:3200
| #, tcl-format
| msgid "Error getting \"%s\" from %s:"
| -msgstr ""
| +msgstr "\"%s\" のエラーが %s に発生:"
|
| #: gitk:3263
| msgid "command failed:"
| @@ -531,7 +531,7 @@ msgstr "git gui blame: コマンド失敗:"
| #: gitk:3454
| #, tcl-format
| msgid "Couldn't read merge head: %s"
| -msgstr ""
| +msgstr "マージする HEAD を読み込めません: %s"
|
| #: gitk:3462
| #, tcl-format
| @@ -555,7 +555,7 @@ msgstr "git blame 実行エラー: %s"
| #: gitk:3550
| #, tcl-format
| msgid "That line comes from commit %s, which is not in this view"
| -msgstr ""
| +msgstr "コミット %s に由来するその行は、このビューに表示されていません"
|
| #: gitk:3564
| msgid "External diff viewer failed:"
| @@ -571,7 +571,7 @@ msgstr "このビューを記憶する"
|
| #: gitk:3687
| msgid "References (space separated list):"
| -msgstr "参照（スペース区切りのリスト）:"
| +msgstr "リファレンス（スペース区切りのリスト）:"
|
| #: gitk:3688
| msgid "Branches & tags:"
| @@ -579,7 +579,7 @@ msgstr "ブランチ＆タグ:"
|
| #: gitk:3689
| msgid "All refs"
| -msgstr "全ての参照"
| +msgstr "全てのリファレンス"
|
| #: gitk:3690
| msgid "All (local) branches"
| @@ -646,15 +646,15 @@ msgstr "期間の終わり:"
|
| #: gitk:3705
| msgid "Limit and/or skip a number of revisions (positive integer):"
| -msgstr ""
| +msgstr "制限・省略するリビジョンの数（正の整数）:"
|
| #: gitk:3706
| msgid "Number to show:"
| -msgstr ""
| +msgstr "表示する数:"
|
| #: gitk:3707
| msgid "Number to skip:"
| -msgstr ""
| +msgstr "省略する数:"
|
| #: gitk:3708
| msgid "Miscellaneous options:"
| @@ -666,11 +666,11 @@ msgstr "厳密に日付順で並び替え"
|
| #: gitk:3710
| msgid "Mark branch sides"
| -msgstr ""
| +msgstr "側枝マーク"
|
| #: gitk:3711
| msgid "Limit to first parent"
| -msgstr ""
| +msgstr "最初の親に制限"
|
| #: gitk:3712
| msgid "Simple history"
| @@ -686,7 +686,7 @@ msgstr "含まれるファイル・ディレクトリを一行ごとに入力:"
|
| #: gitk:3715
| msgid "Command to generate more commits to include:"
| -msgstr ""
| +msgstr "コミット追加コマンド:"
|
| #: gitk:3837
| msgid "Gitk: edit view"
| @@ -714,11 +714,11 @@ msgstr "無し"
|
| #: gitk:4464 gitk:6311 gitk:8073 gitk:8088
| msgid "Date"
| -msgstr ""
| +msgstr "日付"
|
| #: gitk:4464 gitk:6311
| msgid "CDate"
| -msgstr ""
| +msgstr "作成日"
|
| #: gitk:4613 gitk:4618
| msgid "Descendant"
| @@ -738,11 +738,11 @@ msgstr "非祖先"
|
| #: gitk:4912
| msgid "Local changes checked in to index but not committed"
| -msgstr ""
| +msgstr "ステージされた、コミット前のローカルな変更"
|
| #: gitk:4948
| msgid "Local uncommitted changes, not checked in to index"
| -msgstr ""
| +msgstr "ステージされていない、コミット前のローカルな変更"
|
| #: gitk:6629
| msgid "many"
| @@ -775,11 +775,11 @@ msgstr "上位"
| #: gitk:7354
| #, tcl-format
| msgid "Error getting diffs: %s"
| -msgstr ""
| +msgstr "diff取得エラー: %s"
|
| #: gitk:7894
| msgid "Goto:"
| -msgstr ""
| +msgstr "Goto:"
|
| #: gitk:7896
| msgid "SHA1 ID:"
| @@ -816,15 +816,15 @@ msgstr "%s ブランチをここにリセットする"
|
| #: gitk:8135
| msgid "Detached head: can't reset"
| -msgstr ""
| +msgstr "切り離されたHEAD: リセットできません"
|
| #: gitk:8244 gitk:8250
| msgid "Skipping merge commit "
| -msgstr ""
| +msgstr "コミットマージをスキップ: "
|
| #: gitk:8259 gitk:8264
| msgid "Error getting patch ID for "
| -msgstr ""
| +msgstr "パッチ取得エラー: ID "
|
| #: gitk:8260 gitk:8265
| msgid " - stopping\n"
| @@ -839,37 +839,43 @@ msgid ""
| " is the same patch as\n"
| " "
| msgstr ""
| +" は下記のパッチと同等\n"
| +" "
|
| #: gitk:8282
| msgid ""
| " differs from\n"
| " "
| msgstr ""
| +" 下記からのdiff\n"
| +" "
|
| #: gitk:8284
| msgid ""
| "Diff of commits:\n"
| "\n"
| msgstr ""
| +"コミットのdiff:\n"
| +"\n"
|
| #: gitk:8295 gitk:8304
| #, tcl-format
| msgid " has %s children - stopping\n"
| -msgstr ""
| +msgstr " には %s の子があります - 停止\n"
|
| #: gitk:8324
| #, tcl-format
| msgid "Error writing commit to file: %s"
| -msgstr ""
| +msgstr "ファイルへのコミット書き込みエラー: %s"
|
| #: gitk:8330
| #, tcl-format
| msgid "Error diffing commits: %s"
| -msgstr ""
| +msgstr "コミットのdiff実行エラー: %s"
|
| #: gitk:8360
| msgid "Top"
| -msgstr ""
| +msgstr "Top"
|
| #: gitk:8361
| msgid "From"
| @@ -942,7 +948,7 @@ msgstr "書き込み"
|
| #: gitk:8620
| msgid "Error writing commit:"
| -msgstr ""
| +msgstr "コミット書き込みエラー:"
|
| #: gitk:8647
| msgid "Name:"
| @@ -985,11 +991,11 @@ msgstr ""
|
| #: gitk:8777
| msgid "No changes committed"
| -msgstr ""
| +msgstr "何の変更もコミットされていません"
|
| #: gitk:8803
| msgid "Confirm reset"
| -msgstr ""
| +msgstr "確認を取り消す"
|
| #: gitk:8805
| #, tcl-format
| @@ -1026,7 +1032,7 @@ msgstr "チェックアウト"
|
| #: gitk:8946
| msgid "Cannot delete the currently checked-out branch"
| -msgstr ""
| +msgstr "現在チェックアウトされているブランチを削除することはできません"
|
| #: gitk:8952
| #, tcl-format
| @@ -1051,6 +1057,8 @@ msgid ""
| "Error reading commit topology information; branch and preceding/following "
| "tag information will be incomplete."
| msgstr ""
| +"コミット構造情報読み込みエラー; ブランチ及び上位/下位の"
| +"タグ情報が不完全であるようです。"
|
| #: gitk:10279
| msgid "Tag"
| @@ -1111,11 +1119,11 @@ msgstr "近くのタグを表示する"
|
| #: gitk:10471
| msgid "Hide remote refs"
| -msgstr "リモート参照を隠す"
| +msgstr "リモートリファレンスを隠す"
|
| #: gitk:10474
| msgid "Limit diffs to listed paths"
| -msgstr ""
| +msgstr "diff をリストのパスに制限"
|
| #: gitk:10477
| msgid "Support per-file encodings"
[-- Attachment #2: ja.po --]
[-- Type: application/octet-stream, Size: 27095 bytes --]
# Japanese translations for gitk package.
# Copyright (C) 2005-2009 Paul Mackerras
# This file is distributed under the same license as the gitk package.
#
# Mizar <mizar.jp@gmail.com>, 2009.
# Junio C Hamano <gitster@pobox.com>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: gitk\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-10-19 02:45+0900\n"
"PO-Revision-Date: 2009-10-19 17:03+0900\n"
"Last-Translator: Mizar <mizar.jp@gmail.com>\n"
"Language-Team: Japanese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: gitk:113
msgid "Couldn't get list of unmerged files:"
msgstr "マージされていないファイルのリストを取得できません:"
#: gitk:269
msgid "Error parsing revisions:"
msgstr "リビジョン解析エラー:"
#: gitk:324
msgid "Error executing --argscmd command:"
msgstr "--argscmd コマンド実行エラー:"
#: gitk:337
msgid "No files selected: --merge specified but no files are unmerged."
msgstr "ファイル未選択: --merge が指定されましたが、マージされていないファイルはありません。"
#: gitk:340
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
msgstr "ファイル未選択: --merge が指定されましたが、"
"ファイル制限内にマージされていないファイルはありません。"
#: gitk:362 gitk:509
msgid "Error executing git log:"
msgstr "git log 実行エラー:"
#: gitk:380 gitk:525
msgid "Reading"
msgstr "読み込み中"
#: gitk:440 gitk:4131
msgid "Reading commits..."
msgstr "コミット読み込み中..."
#: gitk:443 gitk:1561 gitk:4134
msgid "No commits selected"
msgstr "コミットが選択されていません"
#: gitk:1437
msgid "Can't parse git log output:"
msgstr "git log の出力を解析できません:"
#: gitk:1657
msgid "No commit information available"
msgstr "有効なコミットの情報がありません"
#: gitk:1793 gitk:1817 gitk:3924 gitk:8822 gitk:10358 gitk:10534
msgid "OK"
msgstr "OK"
#: gitk:1819 gitk:3926 gitk:8419 gitk:8493 gitk:8603 gitk:8652 gitk:8824
#: gitk:10359 gitk:10535
msgid "Cancel"
msgstr "キャンセル"
#: gitk:1919
msgid "Update"
msgstr "更新"
#: gitk:1920
msgid "Reload"
msgstr "リロード"
#: gitk:1921
msgid "Reread references"
msgstr "リファレンスを再読み込み"
#: gitk:1922
msgid "List references"
msgstr "リファレンスリストを表示"
#: gitk:1924
msgid "Start git gui"
msgstr "git gui の開始"
#: gitk:1926
msgid "Quit"
msgstr "終了"
#: gitk:1918
msgid "File"
msgstr "ファイル"
#: gitk:1930
msgid "Preferences"
msgstr "設定"
#: gitk:1929
msgid "Edit"
msgstr "編集"
#: gitk:1934
msgid "New view..."
msgstr "新規ビュー..."
#: gitk:1935
msgid "Edit view..."
msgstr "ビュー編集..."
#: gitk:1936
msgid "Delete view"
msgstr "ビュー削除"
#: gitk:1938
msgid "All files"
msgstr "全てのファイル"
#: gitk:1933 gitk:3678
msgid "View"
msgstr "ビュー"
#: gitk:1943 gitk:1953 gitk:2655
msgid "About gitk"
msgstr "gitk について"
#: gitk:1944 gitk:1958
msgid "Key bindings"
msgstr "キーバインディング"
#: gitk:1942 gitk:1957
msgid "Help"
msgstr "ヘルプ"
#: gitk:2018
msgid "SHA1 ID: "
msgstr "SHA1 ID: "
#: gitk:2049
msgid "Row"
msgstr "行"
#: gitk:2080
msgid "Find"
msgstr "検索"
#: gitk:2081
msgid "next"
msgstr "次"
#: gitk:2082
msgid "prev"
msgstr "前"
#: gitk:2083
msgid "commit"
msgstr "コミット"
#: gitk:2086 gitk:2088 gitk:4292 gitk:4315 gitk:4339 gitk:6280 gitk:6352
#: gitk:6436
msgid "containing:"
msgstr "含む:"
#: gitk:2089 gitk:3163 gitk:3168 gitk:4367
msgid "touching paths:"
msgstr "パスの一部:"
#: gitk:2090 gitk:4372
msgid "adding/removing string:"
msgstr "追加/除去する文字列:"
#: gitk:2099 gitk:2101
msgid "Exact"
msgstr "英字の大小を区別する"
#: gitk:2101 gitk:4447 gitk:6248
msgid "IgnCase"
msgstr "英字の大小を区別しない"
#: gitk:2101 gitk:4341 gitk:4445 gitk:6244
msgid "Regexp"
msgstr "正規表現"
#: gitk:2103 gitk:2104 gitk:4466 gitk:4496 gitk:4503 gitk:6372 gitk:6440
msgid "All fields"
msgstr "全ての項目"
#: gitk:2104 gitk:4464 gitk:4496 gitk:6311
msgid "Headline"
msgstr "ヘッドライン"
#: gitk:2105 gitk:4464 gitk:6311 gitk:6440 gitk:6874
msgid "Comments"
msgstr "コメント"
#: gitk:2105 gitk:4464 gitk:4468 gitk:4503 gitk:6311 gitk:6809 gitk:8071
#: gitk:8086
msgid "Author"
msgstr "作成者"
#: gitk:2105 gitk:4464 gitk:6311 gitk:6811
msgid "Committer"
msgstr "コミットした人"
#: gitk:2134
msgid "Search"
msgstr "検索"
#: gitk:2141
msgid "Diff"
msgstr "Diff"
#: gitk:2143
msgid "Old version"
msgstr "旧バージョン"
#: gitk:2145
msgid "New version"
msgstr "新バージョン"
#: gitk:2147
msgid "Lines of context"
msgstr "文脈行数"
#: gitk:2157
msgid "Ignore space change"
msgstr "空白の違いを無視"
#: gitk:2215
msgid "Patch"
msgstr "パッチ"
#: gitk:2217
msgid "Tree"
msgstr "ツリー"
#: gitk:2361 gitk:2378
msgid "Diff this -> selected"
msgstr "diff これ -> 選択"
#: gitk:2362 gitk:2379
msgid "Diff selected -> this"
msgstr "diff 選択 -> これ"
#: gitk:2363 gitk:2380
msgid "Make patch"
msgstr "パッチ作成"
#: gitk:2364 gitk:8477
msgid "Create tag"
msgstr "タグ生成"
#: gitk:2365 gitk:8583
msgid "Write commit to file"
msgstr "コミットをファイルに書き込む"
#: gitk:2366 gitk:8640
msgid "Create new branch"
msgstr "新規ブランチ生成"
#: gitk:2367
msgid "Cherry-pick this commit"
msgstr "このコミットをチェリーピックする"
#: gitk:2368
msgid "Reset HEAD branch to here"
msgstr "ブランチのHEADをここにリセットする"
#: gitk:2369
msgid "Mark this commit"
msgstr "このコミットにマークをつける"
#: gitk:2370
msgid "Return to mark"
msgstr "マークを付けた所に戻る"
#: gitk:2371
msgid "Find descendant of this and mark"
msgstr "この子孫を見つけてマークする"
#: gitk:2372
msgid "Compare with marked commit"
msgstr "マークを付けたコミットと比較する"
#: gitk:2386
msgid "Check out this branch"
msgstr "このブランチをチェックアウトする"
#: gitk:2387
msgid "Remove this branch"
msgstr "このブランチを除去する"
#: gitk:2394
msgid "Highlight this too"
msgstr "これもハイライトさせる"
#: gitk:2395
msgid "Highlight this only"
msgstr "これだけをハイライトさせる"
#: gitk:2396
msgid "External diff"
msgstr "外部diffツール"
#: gitk:2397
msgid "Blame parent commit"
msgstr "親コミットから blame をかける"
#: gitk:2404
msgid "Show origin of this line"
msgstr "この行の出自を表示する"
#: gitk:2405
msgid "Run git gui blame on this line"
msgstr "この行に git gui で blame をかける"
#: gitk:2657
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2008 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - gitコミットビューア\n"
"\n"
"Copyright © 2005-2008 Paul Mackerras\n"
"\n"
"使用および再配布は GNU General Public License に従ってください"
#: gitk:2665 gitk:2727 gitk:9005
msgid "Close"
msgstr "閉じる"
#: gitk:2684
msgid "Gitk key bindings"
msgstr "Gitk キーバインディング"
#: gitk:2687
msgid "Gitk key bindings:"
msgstr "Gitk キーバインディング:"
#: gitk:2689
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\t終了"
#: gitk:2690
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\t最初のコミットに移動"
#: gitk:2691
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\t最後のコミットに移動"
#: gitk:2692
msgid "<Up>, p, i\tMove up one commit"
msgstr "<Up>, p, i\t一つ上のコミットに移動"
#: gitk:2693
msgid "<Down>, n, k\tMove down one commit"
msgstr "<Down>, n, k\t一つ下のコミットに移動"
#: gitk:2694
msgid "<Left>, z, j\tGo back in history list"
msgstr "<Left>, z, j\t履歴の前に戻る"
#: gitk:2695
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Right>, x, l\t履歴の次へ進む"
#: gitk:2696
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tコミットリストの一つ上のページに移動"
#: gitk:2697
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tコミットリストの一つ下のページに移動"
#: gitk:2698
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tコミットリストの一番上にスクロールする"
#: gitk:2699
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tコミットリストの一番下にスクロールする"
#: gitk:2700
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする"
#: gitk:2701
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする"
#: gitk:2702
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする"
#: gitk:2703
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする"
#: gitk:2704
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Shift-Up>\t後ろを検索 (上方・後のコミット)"
#: gitk:2705
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Shift-Down>\t前を検索（下方・前のコミット）"
#: gitk:2706
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tdiff画面を上のページにスクロールする"
#: gitk:2707
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tdiff画面を上のページにスクロールする"
#: gitk:2708
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Space>\t\tdiff画面を下のページにスクロールする"
#: gitk:2709
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tdiff画面を上に18行スクロールする"
#: gitk:2710
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tdiff画面を下に18行スクロールする"
#: gitk:2711
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\t検索"
#: gitk:2712
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\t次を検索して移動"
#: gitk:2713
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\t次を検索して移動"
#: gitk:2714
msgid "/\t\tFocus the search box"
msgstr "/\t\t検索ボックスにフォーカス"
#: gitk:2715
msgid "?\t\tMove to previous find hit"
msgstr "?\t\t前を検索して移動"
#: gitk:2716
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\t次のファイルにdiff画面をスクロールする"
#: gitk:2717
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tdiff画面の次を検索"
#: gitk:2718
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tdiff画面の前を検索"
#: gitk:2719
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\t文字サイズを拡大"
#: gitk:2720
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\t文字サイズを拡大"
#: gitk:2721
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\t文字サイズを縮小"
#: gitk:2722
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\t文字サイズを縮小"
#: gitk:2723
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\t更新"
#: gitk:3178 gitk:3187
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "一時ディレクトリ %s 生成時エラー:"
#: gitk:3200
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "\"%s\" のエラーが %s に発生:"
#: gitk:3263
msgid "command failed:"
msgstr "コマンド失敗:"
#: gitk:3409
msgid "No such commit"
msgstr "そのようなコミットはありません"
#: gitk:3423
msgid "git gui blame: command failed:"
msgstr "git gui blame: コマンド失敗:"
#: gitk:3454
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "マージする HEAD を読み込めません: %s"
#: gitk:3462
#, tcl-format
msgid "Error reading index: %s"
msgstr "インデックス読み込みエラー: %s"
#: gitk:3487
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "git blame を始められません: %s"
#: gitk:3490 gitk:6279
msgid "Searching"
msgstr "検索中"
#: gitk:3522
#, tcl-format
msgid "Error running git blame: %s"
msgstr "git blame 実行エラー: %s"
#: gitk:3550
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "コミット %s に由来するその行は、このビューに表示されていません"
#: gitk:3564
msgid "External diff viewer failed:"
msgstr "外部diffビューアが失敗:"
#: gitk:3682
msgid "Gitk view definition"
msgstr "Gitk ビュー定義"
#: gitk:3686
msgid "Remember this view"
msgstr "このビューを記憶する"
#: gitk:3687
msgid "References (space separated list):"
msgstr "リファレンス（スペース区切りのリスト）:"
#: gitk:3688
msgid "Branches & tags:"
msgstr "ブランチ＆タグ:"
#: gitk:3689
msgid "All refs"
msgstr "全てのリファレンス"
#: gitk:3690
msgid "All (local) branches"
msgstr "全ての（ローカルな）ブランチ"
#: gitk:3691
msgid "All tags"
msgstr "全てのタグ"
#: gitk:3692
msgid "All remote-tracking branches"
msgstr "全てのリモート追跡ブランチ"
#: gitk:3693
msgid "Commit Info (regular expressions):"
msgstr "コミット情報（正規表現）:"
#: gitk:3694
msgid "Author:"
msgstr "作成者:"
#: gitk:3695
msgid "Committer:"
msgstr "コミットした人:"
#: gitk:3696
msgid "Commit Message:"
msgstr "コミットメッセージ:"
#: gitk:3697
msgid "Matches all Commit Info criteria"
msgstr "コミット情報の全ての条件に一致"
#: gitk:3698
msgid "Changes to Files:"
msgstr "変更したファイル:"
#: gitk:3699
msgid "Fixed String"
msgstr "固定文字列"
#: gitk:3700
msgid "Regular Expression"
msgstr "正規表現"
#: gitk:3701
msgid "Search string:"
msgstr "検索文字列:"
#: gitk:3702
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
msgstr "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
#: gitk:3703
msgid "Since:"
msgstr "期間の始め:"
#: gitk:3704
msgid "Until:"
msgstr "期間の終わり:"
#: gitk:3705
msgid "Limit and/or skip a number of revisions (positive integer):"
msgstr "制限・省略するリビジョンの数（正の整数）:"
#: gitk:3706
msgid "Number to show:"
msgstr "表示する数:"
#: gitk:3707
msgid "Number to skip:"
msgstr "省略する数:"
#: gitk:3708
msgid "Miscellaneous options:"
msgstr "その他のオプション:"
#: gitk:3709
msgid "Strictly sort by date"
msgstr "厳密に日付順で並び替え"
#: gitk:3710
msgid "Mark branch sides"
msgstr "側枝マーク"
#: gitk:3711
msgid "Limit to first parent"
msgstr "最初の親に制限"
#: gitk:3712
msgid "Simple history"
msgstr "簡易な履歴"
#: gitk:3713
msgid "Additional arguments to git log:"
msgstr "git log への追加の引数:"
#: gitk:3714
msgid "Enter files and directories to include, one per line:"
msgstr "含まれるファイル・ディレクトリを一行ごとに入力:"
#: gitk:3715
msgid "Command to generate more commits to include:"
msgstr "コミット追加コマンド:"
#: gitk:3837
msgid "Gitk: edit view"
msgstr "Gitk: ビュー編集"
#: gitk:3845
msgid "-- criteria for selecting revisions"
msgstr "― リビジョンの選択条件"
#: gitk:3850
msgid "View Name:"
msgstr "ビュー名:"
#: gitk:3925
msgid "Apply (F5)"
msgstr "適用 (F5)"
#: gitk:3963
msgid "Error in commit selection arguments:"
msgstr "コミット選択引数のエラー:"
#: gitk:4016 gitk:4068 gitk:4516 gitk:4530 gitk:5791 gitk:11232 gitk:11233
msgid "None"
msgstr "無し"
#: gitk:4464 gitk:6311 gitk:8073 gitk:8088
msgid "Date"
msgstr "日付"
#: gitk:4464 gitk:6311
msgid "CDate"
msgstr "作成日"
#: gitk:4613 gitk:4618
msgid "Descendant"
msgstr "子孫"
#: gitk:4614
msgid "Not descendant"
msgstr "非子孫"
#: gitk:4621 gitk:4626
msgid "Ancestor"
msgstr "祖先"
#: gitk:4622
msgid "Not ancestor"
msgstr "非祖先"
#: gitk:4912
msgid "Local changes checked in to index but not committed"
msgstr "ステージされた、コミット前のローカルな変更"
#: gitk:4948
msgid "Local uncommitted changes, not checked in to index"
msgstr "ステージされていない、コミット前のローカルな変更"
#: gitk:6629
msgid "many"
msgstr "多数"
#: gitk:6813
msgid "Tags:"
msgstr "タグ:"
#: gitk:6830 gitk:6836 gitk:8066
msgid "Parent"
msgstr "親"
#: gitk:6841
msgid "Child"
msgstr "子"
#: gitk:6850
msgid "Branch"
msgstr "ブランチ"
#: gitk:6853
msgid "Follows"
msgstr "下位"
#: gitk:6856
msgid "Precedes"
msgstr "上位"
#: gitk:7354
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "diff取得エラー: %s"
#: gitk:7894
msgid "Goto:"
msgstr "Goto:"
#: gitk:7896
msgid "SHA1 ID:"
msgstr "SHA1 ID:"
#: gitk:7915
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "短縮 SHA1 ID %s は曖昧です"
#: gitk:7922
#, tcl-format
msgid "Revision %s is not known"
msgstr "リビジョン %s は不明です"
#: gitk:7932
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "SHA1 id %s は不明です"
#: gitk:7934
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "リビジョン %s は現在のビューにはありません"
#: gitk:8076
msgid "Children"
msgstr "子供達"
#: gitk:8133
#, tcl-format
msgid "Reset %s branch to here"
msgstr "%s ブランチをここにリセットする"
#: gitk:8135
msgid "Detached head: can't reset"
msgstr "切り離されたHEAD: リセットできません"
#: gitk:8244 gitk:8250
msgid "Skipping merge commit "
msgstr "コミットマージをスキップ: "
#: gitk:8259 gitk:8264
msgid "Error getting patch ID for "
msgstr "パッチ取得エラー: ID "
#: gitk:8260 gitk:8265
msgid " - stopping\n"
msgstr " - 停止\n"
#: gitk:8270 gitk:8273 gitk:8281 gitk:8294 gitk:8303
msgid "Commit "
msgstr "コミット "
#: gitk:8274
msgid ""
" is the same patch as\n"
" "
msgstr ""
" は下記のパッチと同等\n"
" "
#: gitk:8282
msgid ""
" differs from\n"
" "
msgstr ""
" 下記からのdiff\n"
" "
#: gitk:8284
msgid ""
"Diff of commits:\n"
"\n"
msgstr ""
"コミットのdiff:\n"
"\n"
#: gitk:8295 gitk:8304
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " には %s の子があります - 停止\n"
#: gitk:8324
#, tcl-format
msgid "Error writing commit to file: %s"
msgstr "ファイルへのコミット書き込みエラー: %s"
#: gitk:8330
#, tcl-format
msgid "Error diffing commits: %s"
msgstr "コミットのdiff実行エラー: %s"
#: gitk:8360
msgid "Top"
msgstr "Top"
#: gitk:8361
msgid "From"
msgstr "From"
#: gitk:8366
msgid "To"
msgstr "To"
#: gitk:8390
msgid "Generate patch"
msgstr "パッチ生成"
#: gitk:8392
msgid "From:"
msgstr "From:"
#: gitk:8401
msgid "To:"
msgstr "To:"
#: gitk:8410
msgid "Reverse"
msgstr "逆"
#: gitk:8412 gitk:8597
msgid "Output file:"
msgstr "出力ファイル:"
#: gitk:8418
msgid "Generate"
msgstr "生成"
#: gitk:8456
msgid "Error creating patch:"
msgstr "パッチ生成エラー:"
#: gitk:8479 gitk:8585 gitk:8642
msgid "ID:"
msgstr "ID:"
#: gitk:8488
msgid "Tag name:"
msgstr "タグ名:"
#: gitk:8492 gitk:8651
msgid "Create"
msgstr "生成"
#: gitk:8509
msgid "No tag name specified"
msgstr "タグの名称が指定されていません"
#: gitk:8513
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "タグ \"%s\" は既に存在します"
#: gitk:8519
msgid "Error creating tag:"
msgstr "タグ生成エラー:"
#: gitk:8594
msgid "Command:"
msgstr "コマンド:"
#: gitk:8602
msgid "Write"
msgstr "書き込み"
#: gitk:8620
msgid "Error writing commit:"
msgstr "コミット書き込みエラー:"
#: gitk:8647
msgid "Name:"
msgstr "名前:"
#: gitk:8670
msgid "Please specify a name for the new branch"
msgstr "新しいブランチの名前を指定してください"
#: gitk:8675
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "ブランチ '%s' は既に存在します。上書きしますか？"
#: gitk:8741
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？"
#: gitk:8746
msgid "Cherry-picking"
msgstr "チェリーピック中"
#: gitk:8755
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
"Please commit, reset or stash your changes and try again."
msgstr ""
"ファイル '%s' のローカルな変更のためにチェリーピックは失敗しました。\n"
"あなたの変更に commit, reset, stash のいずれかを行ってからやり直してください。"
#: gitk:8761
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
msgstr ""
"マージの衝突によってチェリーピックは失敗しました。\n"
"この解決のために git citool を実行したいですか？"
#: gitk:8777
msgid "No changes committed"
msgstr "何の変更もコミットされていません"
#: gitk:8803
msgid "Confirm reset"
msgstr "確認を取り消す"
#: gitk:8805
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "ブランチ %s を %s にリセットしますか？"
#: gitk:8809
msgid "Reset type:"
msgstr "Reset タイプ:"
#: gitk:8813
msgid "Soft: Leave working tree and index untouched"
msgstr "Soft: 作業ツリーもインデックスもそのままにする"
#: gitk:8816
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット"
#: gitk:8819
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
msgstr ""
"Hard: 作業ツリーやインデックスをリセット\n"
"（「全ての」ローカルな変更を破棄）"
#: gitk:8836
msgid "Resetting"
msgstr "リセット中"
#: gitk:8893
msgid "Checking out"
msgstr "チェックアウト"
#: gitk:8946
msgid "Cannot delete the currently checked-out branch"
msgstr "現在チェックアウトされているブランチを削除することはできません"
#: gitk:8952
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
"Really delete branch %s?"
msgstr ""
"ブランチ %s 上のコミットは他のブランチに存在しません。\n"
"本当にブランチ %s を削除しますか？"
#: gitk:8983
#, tcl-format
msgid "Tags and heads: %s"
msgstr "タグとHEAD: %s"
#: gitk:8998
msgid "Filter"
msgstr "フィルター"
#: gitk:9293
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
msgstr ""
"コミット構造情報読み込みエラー; ブランチ及び上位/下位の"
"タグ情報が不完全であるようです。"
#: gitk:10279
msgid "Tag"
msgstr "タグ"
#: gitk:10279
msgid "Id"
msgstr "ID"
#: gitk:10327
msgid "Gitk font chooser"
msgstr "Gitk フォント選択"
#: gitk:10344
msgid "B"
msgstr "B"
#: gitk:10347
msgid "I"
msgstr "I"
#: gitk:10443
msgid "Gitk preferences"
msgstr "Gitk 設定"
#: gitk:10445
msgid "Commit list display options"
msgstr "コミットリスト表示オプション"
#: gitk:10448
msgid "Maximum graph width (lines)"
msgstr "最大グラフ幅（線の本数）"
#: gitk:10452
#, tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "最大グラフ幅（ペインに対する％）"
#: gitk:10456
msgid "Show local changes"
msgstr "ローカルな変更を表示"
#: gitk:10459
msgid "Auto-select SHA1"
msgstr "SHA1 の自動選択"
#: gitk:10463
msgid "Diff display options"
msgstr "diff表示オプション"
#: gitk:10465
msgid "Tab spacing"
msgstr "タブ空白幅"
#: gitk:10468
msgid "Display nearby tags"
msgstr "近くのタグを表示する"
#: gitk:10471
msgid "Hide remote refs"
msgstr "リモートリファレンスを隠す"
#: gitk:10474
msgid "Limit diffs to listed paths"
msgstr "diff をリストのパスに制限"
#: gitk:10477
msgid "Support per-file encodings"
msgstr "ファイルごとのエンコーディングのサポート"
#: gitk:10483 gitk:10548
msgid "External diff tool"
msgstr "外部diffツール"
#: gitk:10485
msgid "Choose..."
msgstr "選択..."
#: gitk:10490
msgid "Colors: press to choose"
msgstr "色: ボタンを押して選択"
#: gitk:10493
msgid "Background"
msgstr "背景"
#: gitk:10494 gitk:10524
msgid "background"
msgstr "背景"
#: gitk:10497
msgid "Foreground"
msgstr "前景"
#: gitk:10498
msgid "foreground"
msgstr "前景"
#: gitk:10501
msgid "Diff: old lines"
msgstr "Diff: 旧バージョン"
#: gitk:10502
msgid "diff old lines"
msgstr "diff 旧バージョン"
#: gitk:10506
msgid "Diff: new lines"
msgstr "Diff: 新バージョン"
#: gitk:10507
msgid "diff new lines"
msgstr "diff 新バージョン"
#: gitk:10511
msgid "Diff: hunk header"
msgstr "Diff: hunkヘッダ"
#: gitk:10513
msgid "diff hunk header"
msgstr "diff hunkヘッダ"
#: gitk:10517
msgid "Marked line bg"
msgstr "マーク行の背景"
#: gitk:10519
msgid "marked line background"
msgstr "マーク行の背景"
#: gitk:10523
msgid "Select bg"
msgstr "選択の背景"
#: gitk:10527
msgid "Fonts: press to choose"
msgstr "フォント: ボタンを押して選択"
#: gitk:10529
msgid "Main font"
msgstr "主フォント"
#: gitk:10530
msgid "Diff display font"
msgstr "Diff表示用フォント"
#: gitk:10531
msgid "User interface font"
msgstr "UI用フォント"
#: gitk:10558
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: 「%s」 の色を選択"
#: gitk:11009
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
msgstr ""
"申し訳ありませんが、このバージョンの Tcl/Tk では gitk を実行できません。\n"
" Gitk は少なくとも Tcl/Tk 8.4 を必要とします。"
#: gitk:11137
msgid "Cannot find a git repository here."
msgstr "ここにはgitリポジトリがありません。"
#: gitk:11141
#, tcl-format
msgid "Cannot find the git directory \"%s\"."
msgstr "gitディレクトリ \"%s\" を見つけられません。"
#: gitk:11188
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます"
#: gitk:11200
msgid "Bad arguments to gitk:"
msgstr "gitkへの不正な引数:"
#: gitk:11285
msgid "Command line"
msgstr "コマンド行"
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox