* Re: git rebase -i <first_commit_in_repository>
From: Dirk Süsserott @ 2009-10-26 20:28 UTC (permalink / raw)
To: eschvoca; +Cc: kusmabite, git
In-Reply-To: <2b05065b0910261108g4a8448c8x295606a8d33612f5@mail.gmail.com>
Am 26.10.2009 19:08 schrieb eschvoca:
> On Mon, Oct 26, 2009 at 1:25 PM, Erik Faye-Lund
> <kusmabite@googlemail.com> wrote:
>> On Mon, Oct 26, 2009 at 6:14 PM, eschvoca <eschvoca@gmail.com> wrote:
>>> Hi,
>>>
>>> Is there a way to rewrite history, including the first commit. It
>>> seems that the first commit can not be modified with a rebase.
>> This question is answered in the FAQ:
>> http://git.or.cz/gitwiki/GitFaq#HowdoIedittherootcommit.3F
>>
>
> Thanks Eric. Hopefully someone will enhance rebase to handle the root commit.
Hi,
probably my approach could help you in the future: When I create a new
repo (git init) I firstly create an initial commit with nothing else
than an initial commit, i.e.:
$ git init
$ echo "initial" > initial.commit
$ git add initial.commit
$ git commit -m "Initial commit"
and then secondly
$ git add .
$ git commit -m "*REAL* initial commit"
Afterwards I have a repo with an initial commit that only contains one
file (initial.commit) and the "real" initial commits thereafter. Maybe
that's a solution for you.
Cheers,
Dirk
^ permalink raw reply
* Re: [PATCH 3/3] git checkout --nodwim
From: Johannes Schindelin @ 2009-10-26 20:12 UTC (permalink / raw)
To: David Roundy
Cc: Junio C Hamano, Nanako Shiraishi, Avery Pennarun, Alex Riesen,
git, Jay Soffian
In-Reply-To: <117f2cc80910240759oa9f57e7h67f06816d37e328c@mail.gmail.com>
Hi,
On Sat, 24 Oct 2009, David Roundy wrote:
> On Sat, Oct 24, 2009 at 2:35 AM, Junio C Hamano <gitster@pobox.com> wrote:
> >> My take on it:
> >>
> >> 1) --no-porcelain
> >>
> >> 2) we all are bike-shedding, not being constructive at all
> >
> > You are right about (2), regarding the option name. I've queued one that
> > uses --no-guess.
>
> Perhaps a universal --plumbing flag would be handy?
No. Older Git versions do not know about it, so you cannot Just Modify
Your Scripts. So the benefit of --plumbing is dubitable.
FWIW the same goes for --no-porcelain.
Ciao,
Dscho
^ permalink raw reply
* Re: [RFC PATCH v2 0/2] git-gui: (un)stage a range of changes at once
From: Jeff Epler @ 2009-10-26 19:39 UTC (permalink / raw)
To: git
In-Reply-To: <1256160023-29629-1-git-send-email-jepler@unpythonic.net>
I've found another problem, which I'll work on as soon as I find a
chance.
When staging multiple "+" lines preceded by a "-" line that must be
turned into context, the converted "-" line must come after *all* the
"+" lines, not just the first one.
Jeff
^ permalink raw reply
* Re: git-svn changing file:// to svn+ssh://
From: Avery Pennarun @ 2009-10-26 19:18 UTC (permalink / raw)
To: pascal; +Cc: git list
In-Reply-To: <4AE5EF55.2070902@obry.net>
On Mon, Oct 26, 2009 at 2:49 PM, Pascal Obry <pascal@obry.net> wrote:
> On a large project it is failing. Here is what I have done:
>
> I have cloned the repository using:
>
> $ git svn clone --prefix=svn/ file:///path/repo \
> --revision=15314:HEAD --trunk=trunk/project \
> --tags=tags/project --branches=branches/project \
> --branches="branches/global/*/project" project
>
> Not simple, ok but working :)
>
> Now I have converted the file:// to svn+ssh:// using:
I'm not sure about the actual bug you're experiencing, but you could
have done this more simply using the --rewrite-root option to git-svn.
It might still save you time to just do that from scratch.
If you really want to debug it, you might want to run it through
'strace' and see if it's having any trouble creating those files.
Have fun,
Avery
^ permalink raw reply
* git-svn changing file:// to svn+ssh://
From: Pascal Obry @ 2009-10-26 18:49 UTC (permalink / raw)
To: git list
I'm working on preparing Git SVN mirrors.
I had tested my procedure on a small project and it was working fine.
On a large project it is failing. Here is what I have done:
I have cloned the repository using:
$ git svn clone --prefix=svn/ file:///path/repo \
--revision=15314:HEAD --trunk=trunk/project \
--tags=tags/project --branches=branches/project \
--branches="branches/global/*/project" project
Not simple, ok but working :)
Now I have converted the file:// to svn+ssh:// using:
$ git gc
$ git filter-branch --msg-filter \
'sed "s,git-svn-id: file:///path/repo,git-svn-id:
svn+ssh://server/repo,g"' \
$(cat .git/packed-refs | awk '// {print $2}' | grep -v 'pack-refs')
$ rm -fr .git/svn
I have edited .git/config to change the url string too.
Up to there, no problem. But when trying to rebase and reconstruct all
rev_map files with:
$ git svn rebase
I get the following lines again and again:
Rebuilding
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c ...
Done rebuilding
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c
Rebuilding
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c ...
Done rebuilding
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c
...
The file
.git/svn/svn/trunk/.rev_map.f8352e7e-cb20-0410-8ce7-b5d9e71c585c is in
fact not created.
What could be wrong?
How should I proceed to debug this?
Any help appreciated.
Last note I've tried all this with Git 1.6.4 and 1.6.5.
Thanks,
Pascal.
--
--|------------------------------------------------------
--| Pascal Obry Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--| http://www.obry.net - http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B
^ permalink raw reply
* Re: [PATCH] git checkout --no-guess
From: Avery Pennarun @ 2009-10-26 18:25 UTC (permalink / raw)
To: Jay Soffian; +Cc: Git Mailing List
In-Reply-To: <76718490910261117i60a556ebv7405e945796a3610@mail.gmail.com>
On Mon, Oct 26, 2009 at 2:17 PM, Jay Soffian <jaysoffian@gmail.com> wrote:
> On Wed, Oct 21, 2009 at 3:51 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
>> Just curious. (And now wondering how many other wonderful options are
>> in there but undocumented...)
>
> * PARSE_OPT_HIDDEN: this option is skipped in the default usage, and
> * shown only in the full usage.
>
> Which translates to --help-all:
>
> --help-all
> Some git commands take options that are only used for
> plumbing or that are deprecated, and such options are hidden from the
> default usage. This option gives the full list of options.
>
> So git checkout --help-all should show it.
Thanks! I had no idea about --help-all.
Avery
^ permalink raw reply
* Re: [PATCH] git checkout --no-guess
From: Jay Soffian @ 2009-10-26 18:17 UTC (permalink / raw)
To: Avery Pennarun
Cc: Junio C Hamano, git, Nanako Shiraishi, Alex Riesen,
Johannes Schindelin
In-Reply-To: <32541b130910211551n13e0dd1bha6dcdc82d1d6b4cd@mail.gmail.com>
On Wed, Oct 21, 2009 at 3:51 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
> On Wed, Oct 21, 2009 at 6:35 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> As this is strictly script-only option, do not even bother to document it,
>> and do bother to hide it from "git checkout -h".
>
> Is it a standard git policy to not document script-only options? As a
> person who writes scripts that use git, we will need to discover these
> options somehow...
>
> Just curious. (And now wondering how many other wonderful options are
> in there but undocumented...)
* PARSE_OPT_HIDDEN: this option is skipped in the default usage, and
* shown only in the full usage.
Which translates to --help-all:
--help-all
Some git commands take options that are only used for
plumbing or that are deprecated, and such options are hidden from the
default usage. This option gives the full list of options.
So git checkout --help-all should show it.
j.
^ permalink raw reply
* Re: git rebase -i <first_commit_in_repository>
From: eschvoca @ 2009-10-26 18:08 UTC (permalink / raw)
To: kusmabite; +Cc: git
In-Reply-To: <40aa078e0910261025l1ad7bf8ex27fd62072a317f9d@mail.gmail.com>
On Mon, Oct 26, 2009 at 1:25 PM, Erik Faye-Lund
<kusmabite@googlemail.com> wrote:
> On Mon, Oct 26, 2009 at 6:14 PM, eschvoca <eschvoca@gmail.com> wrote:
>> Hi,
>>
>> Is there a way to rewrite history, including the first commit. It
>> seems that the first commit can not be modified with a rebase.
>
> This question is answered in the FAQ:
> http://git.or.cz/gitwiki/GitFaq#HowdoIedittherootcommit.3F
>
Thanks Eric. Hopefully someone will enhance rebase to handle the root commit.
^ permalink raw reply
* Re: git rebase -i <first_commit_in_repository>
From: Erik Faye-Lund @ 2009-10-26 17:25 UTC (permalink / raw)
To: eschvoca; +Cc: git
In-Reply-To: <2b05065b0910261014t4eb93952oc804bcd01b339a84@mail.gmail.com>
On Mon, Oct 26, 2009 at 6:14 PM, eschvoca <eschvoca@gmail.com> wrote:
> Hi,
>
> Is there a way to rewrite history, including the first commit. It
> seems that the first commit can not be modified with a rebase.
This question is answered in the FAQ:
http://git.or.cz/gitwiki/GitFaq#HowdoIedittherootcommit.3F
--
Erik "kusma" Faye-Lund
^ permalink raw reply
* Re: git rebase -i <first_commit_in_repository>
From: Mike Hommey @ 2009-10-26 17:24 UTC (permalink / raw)
To: eschvoca; +Cc: git
In-Reply-To: <2b05065b0910261014t4eb93952oc804bcd01b339a84@mail.gmail.com>
On Mon, Oct 26, 2009 at 01:14:47PM -0400, eschvoca wrote:
> Hi,
>
> Is there a way to rewrite history, including the first commit. It
> seems that the first commit can not be modified with a rebase.
Unfortunately, there is no way to do so, except by hand, by checking out
the first commit, amend it, and then rebase.
Mike
^ permalink raw reply
* git rebase -i <first_commit_in_repository>
From: eschvoca @ 2009-10-26 17:14 UTC (permalink / raw)
To: git
Hi,
Is there a way to rewrite history, including the first commit. It
seems that the first commit can not be modified with a rebase.
Cheers.
^ permalink raw reply
* Re: [ANNOUNCE] Stacked Git 0.15
From: Catalin Marinas @ 2009-10-26 16:23 UTC (permalink / raw)
To: Karl Wiberg; +Cc: Jakub Narebski, Git Mailing List
In-Reply-To: <20091026134915.GA1565@diana.vm.bytemark.co.uk>
2009/10/26 Karl Wiberg <kha@treskal.com>:
> On 2009-10-26 10:32:07 +0000, Catalin Marinas wrote:
>> The problem was a bit more complicated than this. Some files are
>> generated by the Makefile rather than setup.py so using the latter
>> directly fails to build anything.
>>
>> So it's time for 0.15.1 this week with the fix below (in my
>> "proposed" branch). I cc'ed Karl as well in case he has time to have
>> a quick look.
>
> I don't have any objections, except ...
[...]
>> -test: build
>> +test:
>> cd t && $(MAKE) all
>
> ... don't we need to run "setup.py build" here in order to not change
> the behavior?
Good point. I updated the patch in the "proposed" branch.
Thanks.
--
Catalin
^ permalink raw reply
* Re: keeping track of where a patch begins
From: Jeff King @ 2009-10-26 14:30 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Nicolas Pitre, E R, git
In-Reply-To: <7veiow4iqc.fsf@alter.siamese.dyndns.org>
On Wed, Oct 21, 2009 at 01:03:55PM -0700, Junio C Hamano wrote:
> (0) Define a way to identify the bottom of a branch. One way to do this
> is by an extra ref (e.g. refs/branchpoints/frotz). Then the commits
> between refs/branchpoints/frotz..refs/heads/frotz identifies the
> commits on the branch. None of the additional restrictions below
> applies when the branch does not have such bottom defined (i.e.
> created by the current git without this extension).
Hmm. This feels like redundant information to me. It has always been
git's strategy to record the history graph, and to use merge bases as
the "bottom" of branches, rather than keeping an artificial "started
here" commit. So I am trying to see the advantages of recording a static
bottom versus doing a merge-base calculation later. Some things I can
think of:
- a bottom implies a specific commit, whereas a merge-base is always
with respect to anothe tip. So to have a default "bottom" calculated
by merge-base, you need a default "upstream". Which we do have, but
of course it is subject to being rewound.
- your merge-base will move when you merge. But arguably, that is a
good thing. If you are talking about "git log" only looking at the
commits on this branch (as you do later in the quoted email), I
would expect to see only stuff that happened since upstream last
merged. Although to be honest, I am not sure such a limit is all
that useful. We already have "git log upstream..branch".
So I am not really clear on what you are trying to accomplish by
recording such a bottom. Your steps (0) through (3) seem to be leading
up to this use case:
> (4) Operations that browse histories, e.g. "log", "show-branch", while on
> a branch that records its bottom can be taught to pay attention to
> the bottom. For example, it is conceivable that
>
> $ git log
> $ git log -- Documentation/
>
> without an explicit branch name that fell back to the default HEAD
> while on branch "frotz" might be better run with an implicit bottom
> ^refs/branchpoint/frotz.
If that is all you want, can't we just default to something like:
$ git log $(git for-each-ref --format='%(upstream)' $(git symbolic-ref HEAD)))..
Of course it would be much easier to type as "git log @{upstream}.." :)
-Peff
^ permalink raw reply
* Re: git hang with corrupted .pack
From: Shawn O. Pearce @ 2009-10-26 14:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Alex Riesen, Nicolas Pitre, Andy Isaacson, git
In-Reply-To: <7vr5sqq3vm.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> Alex Riesen <raa.lkml@gmail.com> writes:
> > I seem to have problems with this change (on Cygwin). Sometimes
> > accessing an object in a pack fails in unpack_compressed_entry.
> > When it happens, both avail_in and avail_out of the stream are 0,
> > and the reported status is Z_BUF_ERROR.
...
> Subject: Fix incorrect error check while reading deflated pack data
Wow.
> The right fix for this loop is likely to be to increment the initial
> avail_out by one (we allocate one extra byte to terminate it with NUL
> anyway, so there is no risk to overrun the buffer), and break out if we
> see that avail_out has become zero, in order to detect that the stream
> wants to produce more than what we expect. After the loop, we have a
> check that exactly tests this condition:
>
> if ((st != Z_STREAM_END) || stream.total_out != size) {
> free(buffer);
> return NULL;
> }
>
> So here is a patch (without my previous botched attempts) to fix this
> issue. The first hunk reverts the corresponding hunk from b3118bd, and
> the second hunk is the same fix proposed earlier.
ACK. This looks right to me too. I forgot about that end-of-stream
marker on the input buffer, and my testing failed to have a stream
where the end-of-stream marker was in the next back window, so this
"fix" wasn't triggering.
*sigh* Thanks for digging into this and fixing it while I was away.
--
Shawn.
^ permalink raw reply
* Re: [ANNOUNCE] Stacked Git 0.15
From: Karl Wiberg @ 2009-10-26 13:49 UTC (permalink / raw)
To: Catalin Marinas; +Cc: Jakub Narebski, Git Mailing List
In-Reply-To: <b0943d9e0910260332x1ca40f97r351e94f5baeb1c6b@mail.gmail.com>
On 2009-10-26 10:32:07 +0000, Catalin Marinas wrote:
> The problem was a bit more complicated than this. Some files are
> generated by the Makefile rather than setup.py so using the latter
> directly fails to build anything.
>
> So it's time for 0.15.1 this week with the fix below (in my
> "proposed" branch). I cc'ed Karl as well in case he has time to have
> a quick look.
I don't have any objections, except ...
> diff --git a/Makefile b/Makefile
> index 0fa5c6a..5f88f7d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -4,20 +4,10 @@ PYTHON ?= python
>
> TEST_PATCHES ?= ..
>
> -all: build
> +all:
> $(PYTHON) setup.py build
>
> -build: stgit/commands/cmdlist.py stgit-completion.bash
> -
> -ALL_PY = $(shell find stgit -name '*.py')
> -
> -stgit/commands/cmdlist.py: $(ALL_PY)
> - $(PYTHON) stg-build --py-cmd-list > $@
> -
> -stgit-completion.bash: $(ALL_PY)
> - $(PYTHON) stg-build --bash-completion > $@
> -
> -install: build
> +install:
> $(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) --force
>
> doc:
> @@ -29,10 +19,10 @@ install-doc:
> install-html:
> $(MAKE) -C Documentation install-html
>
> -test: build
> +test:
> cd t && $(MAKE) all
... don't we need to run "setup.py build" here in order to not change
the behavior?
--
Karl Wiberg, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* [PATCH] gitk: Add Japanese translation
From: Mizar @ 2009-10-26 13:49 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
私はgitkの日本語訳をしてみました。その訳を添付します。
I tried to Japanese translation of gitk. Attached to its translation.
いくつかのメッセージはまだ翻訳されていません。
Some messages are not translated yet.
そして、いくつかの変な翻訳が見つかるかもしれません。
And, you may find some strange translations.
より良い日本語訳の案がある人はお知らせください。
People have a better idea of Japanese translation, please let us know.
My temporary work place: http://github.com/mizar/gitk
[-- Attachment #2: patch0.patch --]
[-- Type: application/octet-stream, Size: 26975 bytes --]
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..5aaf5f5
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,1236 @@
+# 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.
+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 "A-Z/a-zを区別"
+
+#: gitk:2101 gitk:4447 gitk:6248
+msgid "IgnCase"
+msgstr "A-Z/a-zを区別しない"
+
+#: 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 ""
+
+#: gitk:2404
+msgid "Show origin of this line"
+msgstr ""
+
+#: gitk:2405
+msgid "Run git gui blame on this line"
+msgstr ""
+
+#: 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 (c) 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: gitk:7894
+msgid "Goto:"
+msgstr ""
+
+#: 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 ""
+
+#: gitk:8244 gitk:8250
+msgid "Skipping merge commit "
+msgstr ""
+
+#: gitk:8259 gitk:8264
+msgid "Error getting patch ID for "
+msgstr ""
+
+#: 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 ""
+
+#: gitk:8282
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+
+#: gitk:8284
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+
+#: gitk:8295 gitk:8304
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr ""
+
+#: gitk:8324
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr ""
+
+#: gitk:8330
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr ""
+
+#: gitk:8360
+msgid "Top"
+msgstr ""
+
+#: 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 ""
+
+#: 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 related
* Re: Any way to "flatten" a series of changes in git
From: Daniele Segato @ 2009-10-26 13:42 UTC (permalink / raw)
To: Howard Miller; +Cc: Jacob Helwig, Bill Lear, git
In-Reply-To: <26ae428a0910221358r47434b4uf7ec71f9376b9f75@mail.gmail.com>
On Thu, Oct 22, 2009 at 9:58 PM, Howard Miller
<howard@e-learndesign.co.uk> wrote:
>> git merge --squash topic
>> rebase --interactive it excellent for cleaning up history, especially [...]
> Brilliant, thanks everybody!! I'll go and back up my database and have
> a play with these options.
I don't think you need it.
when you rebase or squash git don't throw away your commits
when I do things like that I usually create a new branch to do my tests
if I'm happy with the result I can do
git checkout myRealBranch
git reset --hard myTestBranch
# do the push/svn dcommit/whatever
if I'm not happy I can start all over again just doing:
git checkout MyTestBranch
git reset --hard myRealBranch
regards,
Daniele
^ permalink raw reply
* Re: [ANNOUNCE] Stacked Git 0.15
From: Catalin Marinas @ 2009-10-26 10:32 UTC (permalink / raw)
To: Jakub Narebski; +Cc: Git Mailing List, Karl Wiberg
In-Reply-To: <b0943d9e0910251013v19fb39b7we412e7f734c2755f@mail.gmail.com>
2009/10/25 Catalin Marinas <catalin.marinas@gmail.com>:
> 2009/10/25 Jakub Narebski <jnareb@gmail.com>:
>> Catalin Marinas <catalin.marinas@gmail.com> writes:
>>
>>> StGit is a Python application providing functionality similar to Quilt
>>> (i.e. pushing/popping patches to/from a stack) on top of Git. These
>>> operations are performed using Git commands, and the patches are
>>> stored as Git commit objects, allowing easy merging of the StGit
>>> patches into other repositories using standard Git functionality.
>>>
>>> Download: http://download.gna.org/stgit/stgit-0.15.tar.gz
>>> Main repository: git://repo.or.cz/stgit.git
>>> Project homepage: http://www.procode.org/stgit/
>>> Mailing list: git@vger.kernel.org (please use "StGit" in the subject)
>>> Bug tracker: https://gna.org/bugs/?group=stgit
>>
>> Is there RPM or SRPM (src.rpm) available somewhere? Or does tarball
>> include *.spec file, or an rpm target?
>
> Late last night when running my release script I realised that
> setup.py no longer accepts the --prefix=/usr option I used for RPMs.
> I'll try to build one in the next couple of days (I wasn't even sure
> anyone was using it).
The problem was a bit more complicated than this. Some files are
generated by the Makefile rather than setup.py so using the latter
directly fails to build anything.
So it's time for 0.15.1 this week with the fix below (in my "proposed"
branch). I cc'ed Karl as well in case he has time to have a quick
look.
Fix setup.py to generate the needed files
From: Catalin Marinas <catalin.marinas@gmail.com>
StGit was relying on Makefile to generate some files but this breaks
using setup.py directly for targets like rpm.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---
Makefile | 20 +++++---------------
setup.cfg | 2 +-
setup.py | 17 ++++++++++++++---
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
index 0fa5c6a..5f88f7d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,20 +4,10 @@ PYTHON ?= python
TEST_PATCHES ?= ..
-all: build
+all:
$(PYTHON) setup.py build
-build: stgit/commands/cmdlist.py stgit-completion.bash
-
-ALL_PY = $(shell find stgit -name '*.py')
-
-stgit/commands/cmdlist.py: $(ALL_PY)
- $(PYTHON) stg-build --py-cmd-list > $@
-
-stgit-completion.bash: $(ALL_PY)
- $(PYTHON) stg-build --bash-completion > $@
-
-install: build
+install:
$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) --force
doc:
@@ -29,10 +19,10 @@ install-doc:
install-html:
$(MAKE) -C Documentation install-html
-test: build
+test:
cd t && $(MAKE) all
-test_patches: build
+test_patches:
for patch in $$(stg series --noprefix $(TEST_PATCHES)); do \
stg goto $$patch && $(MAKE) test || break; \
done
@@ -53,5 +43,5 @@ tags:
TAGS:
ctags -e -R stgit/*
-.PHONY: all build install doc install-doc install-html test test_patches \
+.PHONY: all install doc install-doc install-html test test_patches \
clean tags TAGS
diff --git a/setup.cfg b/setup.cfg
index 4359033..1eb8e9b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
[install]
-prefix: ~
+prefix: /usr
diff --git a/setup.py b/setup.py
index 3f5ccb2..12ed1db 100755
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,7 @@ import sys, glob, os
from distutils.core import setup
from stgit import version
+from stgit import commands, completion
def __version_to_list(version):
"""Convert a version string to a list of numbers or strings
@@ -63,14 +64,24 @@ def __run_setup():
])
# Check the minimum versions required
-if sys.argv[1] in ['install', 'build']:
- __check_python_version()
- __check_git_version()
+__check_python_version()
+__check_git_version()
# ensure readable template files
old_mask = os.umask(0022)
version.write_builtin_version()
+
+# generate the python command list
+f = file('stgit/commands/cmdlist.py', 'w')
+commands.py_commands(commands.get_commands(allow_cached = False), f)
+f.close()
+
+# generate the bash completion script
+f = file('stgit-completion.bash', 'w')
+completion.write_completion(f)
+f.close()
+
__run_setup()
# restore the old mask
--
Catalin
^ permalink raw reply related
* Re: What's cooking in git.git (Oct 2009, #04; Wed, 21)
From: Clemens Buchacher @ 2009-10-26 10:07 UTC (permalink / raw)
To: Stephen Boyd; +Cc: Junio C Hamano, git
In-Reply-To: <4AE56552.70407@gmail.com>
On Mon, Oct 26, 2009 at 02:01:06AM -0700, Stephen Boyd wrote:
> Clemens Buchacher wrote:
>
> > Why does your PATH include the build directory during make, Stephen?
>
> The Makefile says:
>
> git-completion.bash: git-completion.bash.in git-completion.bash.generate
> # Generate completions for binaries we have just built
> PATH="$(shell pwd)/../..:$$PATH" ./git-completion.bash.generate
Right, of course. I guess ignoring *.sh and *.perl is reasonable then.
> Personally, I'd rather keep it dynamic but I can see how it's useful to
> get the 10x speedup. It would be really cool if we could have the best
> of both worlds, where I keep my dynamic loading, but others can build
> the completion and get the speedup.
Should not be too hard to do using a configuration variable like
core.completion = dynamic.
Clemens
^ permalink raw reply
* Re: What's cooking in git.git (Oct 2009, #04; Wed, 21)
From: Stephen Boyd @ 2009-10-26 9:01 UTC (permalink / raw)
To: Clemens Buchacher; +Cc: Junio C Hamano, git
In-Reply-To: <20091026082931.GA6192@localhost>
Clemens Buchacher wrote:
>> I need to know, to sift acks/kudos based on facts that I can use to decide
>> when to release it to 'master', from wishful thinking that I shouldn't,
>> especially after seeing an obvious issue like the one reported by Stephen
>> Boyd a few days ago (http://mid.gname.com/4AE0190E.8020803@gmail.com/).
>
> I cannot follow that link. If you're referring to the "completion of
> commands available only in build environment" issue, that could also be
> considered a feature, because it allows completion of user-defined scripts.
>
> Why does your PATH include the build directory during make, Stephen?
The Makefile says:
git-completion.bash: git-completion.bash.in git-completion.bash.generate
# Generate completions for binaries we have just built
PATH="$(shell pwd)/../..:$$PATH" ./git-completion.bash.generate
Having user-defined scripts is a good point. Generating the completion
like this removes the possibility of such scripts from appearing in the
completion. Unless users are putting their own "git-*" scripts in their
build directory (sounds odd to me).
Personally, I'd rather keep it dynamic but I can see how it's useful to
get the 10x speedup. It would be really cool if we could have the best
of both worlds, where I keep my dynamic loading, but others can build
the completion and get the speedup.
^ permalink raw reply
* Re: What's cooking in git.git (Oct 2009, #04; Wed, 21)
From: Clemens Buchacher @ 2009-10-26 8:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Stephen Boyd
In-Reply-To: <7vzl7eocd6.fsf@alter.siamese.dyndns.org>
On Mon, Oct 26, 2009 at 12:14:45AM -0700, Junio C Hamano wrote:
> Are you giving this comment after you actually tried it on Windows and
> found it satisfactory, or is it just based on the general description of
> "this should make it faster"?
I just tried and it went down from several seconds to about half a second.
On slower machines I expect the difference to be even more noticable.
> I need to know, to sift acks/kudos based on facts that I can use to decide
> when to release it to 'master', from wishful thinking that I shouldn't,
> especially after seeing an obvious issue like the one reported by Stephen
> Boyd a few days ago (http://mid.gname.com/4AE0190E.8020803@gmail.com/).
I cannot follow that link. If you're referring to the "completion of
commands available only in build environment" issue, that could also be
considered a feature, because it allows completion of user-defined scripts.
Why does your PATH include the build directory during make, Stephen?
Clemens
^ permalink raw reply
* Re: [PATCH/RFC] builtin-checkout: suggest creating local branch when appropriate to do so
From: Junio C Hamano @ 2009-10-26 7:14 UTC (permalink / raw)
To: Uri Okrent
Cc: Jeff King, Daniel Barkalow, Johannes Sixt, Thomas Rast,
Johannes Schindelin, Euguess, Mikael Magnusson, Matthieu Moy,
Jay Soffian, git
In-Reply-To: <4AE48F88.1030108@gmail.com>
Uri Okrent <uokrent@gmail.com> writes:
> Junio C Hamano wrote:
>> In this sequence:
>>
>> 1$ git checkout $commit_name_that_is_not_a_local_branch
>> 2$ git commit; hack; hack; hack;...
>> 3$ git checkout $branch_name
>> [...]
>> Step #3 is where the state built in the detached HEAD "branch" vanishes
>> into lost-found.
>>
>> The experts argued that #3 is where it is dangerous...
>
> If step 3 is where the danger lies, wouldn't it then be most appropriate to put
> the warning message there?
You already get reminded that you were on a detached HEAD in step #3.
The primary point of the message you are replying to was that I do not
agree with the view that step #3 is the most problematic step. The
existing reminder would help people who read it and are capable of
realizing "ah, I started it on a throw-away branch but ended up with
something I would rather keep" and doing "git branch topic HEAD@{1}".
It will not help people who haven't got enough clue yet to know what a
detached HEAD is, or you can refer to your previous point with HEAD@{1}
notation. We do give brief advice at step #1 to alleviate this issue.
^ permalink raw reply
* Re: What's cooking in git.git (Oct 2009, #04; Wed, 21)
From: Junio C Hamano @ 2009-10-26 7:14 UTC (permalink / raw)
To: Clemens Buchacher; +Cc: Junio C Hamano, git
In-Reply-To: <20091025160213.GA8532@localhost>
Clemens Buchacher <drizzd@aon.at> writes:
> On Wed, Oct 21, 2009 at 11:52:30PM -0700, Junio C Hamano wrote:
>
>> * ks/precompute-completion (2009-10-05) 1 commit.
>> (merged to 'next' on 2009-10-14 at adf722a)
>> + Speedup bash completion loading
>>
>> Are people happy with this?
>
> I'm looking forward to this on Windows, where loading the completion script
> can take about 10 seconds.
Thanks.
Are you giving this comment after you actually tried it on Windows and
found it satisfactory, or is it just based on the general description of
"this should make it faster"?
I need to know, to sift acks/kudos based on facts that I can use to decide
when to release it to 'master', from wishful thinking that I shouldn't,
especially after seeing an obvious issue like the one reported by Stephen
Boyd a few days ago (http://mid.gname.com/4AE0190E.8020803@gmail.com/).
^ permalink raw reply
* Re: git hang with corrupted .pack
From: Alex Riesen @ 2009-10-26 7:07 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Nicolas Pitre, Shawn O. Pearce, Andy Isaacson, git
In-Reply-To: <7vr5sqq3vm.fsf@alter.siamese.dyndns.org>
On Mon, Oct 26, 2009 at 03:35, Junio C Hamano <gitster@pobox.com> wrote:
>
> Could you test the patch in
>
> http://mid.gmane.org/7vd44gm089.fsf@alter.siamese.dyndns.org
>
> without your workaround?
>
> -- >8 --
> Subject: Fix incorrect error check while reading deflated pack data
>
I did. It works as intended since about 3 days. It also helped my home
server (a 32bit Linux system), which also experienced the problem.
Thanks!
^ permalink raw reply
* [ANNOUNCE] GIT 1.6.5.2
From: Junio C Hamano @ 2009-10-26 5:19 UTC (permalink / raw)
To: git
The latest maintenance release GIT 1.6.5.2 is available at the
usual places:
http://www.kernel.org/pub/software/scm/git/
git-1.6.5.2.tar.{gz,bz2} (source tarball)
git-htmldocs-1.6.5.2.tar.{gz,bz2} (preformatted docs)
git-manpages-1.6.5.2.tar.{gz,bz2} (preformatted docs)
The RPM binary packages for a few architectures are found in:
RPMS/$arch/git-*-1.6.5.2-1.fc9.$arch.rpm (RPM)
GIT v1.6.5.2 Release Notes
==========================
Fixes since v1.6.5.1
--------------------
* Installation of templates triggered a bug in busybox when using tar
implementation from it.
* "git add -i" incorrectly ignored paths that are already in the index
if they matched .gitignore patterns.
* "git describe --always" should have produced some output even there
were no tags in the repository, but it didn't.
* "git ls-files" when showing tracked files incorrectly paid attention
to the exclude patterns.
Other minor documentation updates are included.
----------------------------------------------------------------
Changes since v1.6.5.1 are as follows:
Andreas Schwab (1):
Work around option parsing bug in the busybox tar implementation
Carlos R. Mafra (1):
Makefile: clean block-sha1/ directory instead of mozilla-sha1/
Jeff King (2):
ls-files: excludes should not impact tracked files
document push's new quiet option
Joe Perches (1):
git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s
Johannes Sixt (2):
Remove a left-over file from t/t5100
Mark files in t/t5100 as UTF-8
Jonathan Nieder (1):
Documentation: describe check-ref-format --branch
Junio C Hamano (4):
Fix incorrect error check while reading deflated pack data
Do not fail "describe --always" in a tag-less repository
Fix list of released versions in the toc document
GIT 1.6.5.2
Markus Heidelberg (1):
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
Matt Kraai (1):
Documentation/git-gc.txt: change "references" to "reference"
Nanako Shiraishi (2):
git push: remove incomplete options list from help text
git push: say that --tag can't be used with --all or --mirror in help text
Nasser Grainawi (1):
Document `delta` attribute in "git help attributes".
Pauli Virtanen (1):
git-add--interactive: never skip files included in index
^ 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