* Re: [PATCH/RFC 2/2] completion: allow use without compiling
From: Stephen Boyd @ 2009-10-28 7:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Shawn O. Pearce, git, Clemens Buchacher, Sverre Rabbelier
In-Reply-To: <7v63a0t29l.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Stephen Boyd <bebarino@gmail.com> writes:
>> Ok. Following Junio's suggestion I think we would have to do the following:
>>
>> (1) Revert the rename (git-completion.bash.in -> git-completion.bash)
>>
>> (2) Add a "generation" mode to git-completion.bash.generate to
>> generate the lists and output them to a file
>>
>> (3) Add logic in git-completion.bash.generate to source the generated
>> file if it exists
>>
>> (4) Source git-completion.bash.generate in git-completion.bash to get
>> the functions moved there
>
> Sorry, I do not quite see why an extra *.generate script is necessary.
I'm still assuming the generation mode has to be sh agnostic, therefore
requiring those functions to be in another *.generate script. Is that wrong?
^ permalink raw reply
* Re: [PATCH] imap-send.c: fix pointer to be const
From: Junio C Hamano @ 2009-10-28 7:48 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Vietor Liu, git
In-Reply-To: <7vljiwq8tc.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> 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
>>
>> ====================================================
>> OpenSSL Changes between 0.9.8k and 1.0:
>>
>> *) Let the TLSv1_method() etc. functions return a 'const' SSL_METHOD
>> pointer and make the SSL_METHOD parameter in SSL_CTX_new,
>> SSL_CTX_set_ssl_version and SSL_set_ssl_method 'const'.
>>
>> Signed-off-by: Vietor Liu <vietor@vxwo.org>
>
> This is much easier to understand.
This indeed _is_ easier to understand, but what this means is that making
"meth" const will break the compilation for people with 0.9.8k.
Their SSL_CTX_new() does not promise the callers that it won't modify the
object its parameter points at, so SSL_CTX_new(meth) will now see exactly
the same issue. You will be discarding "const" qualifier by passing it.
^ permalink raw reply
* Re: [PATCH/RFC 2/2] completion: allow use without compiling
From: Clemens Buchacher @ 2009-10-28 8:19 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Stephen Boyd, Shawn O. Pearce, git, Sverre Rabbelier
In-Reply-To: <7v4opld631.fsf@alter.siamese.dyndns.org>
On Mon, Oct 26, 2009 at 05:38:10PM -0700, Junio C Hamano wrote:
> Clemens Buchacher <drizzd@aon.at> writes:
>
> > On Mon, Oct 26, 2009 at 04:59:18PM -0700, Junio C Hamano wrote:
> >
> >> Stephen Boyd <bebarino@gmail.com> writes:
> >>
> >> > This duplicates code, but I don't know of a way to re-use the dynamic
> >> > code without sourcing a bash script and possibly breaking someone's build.
> >>
> >> (1) If the script notices that there is a file that contains the command
> >> list, it sources it; otherwise,
> >
> > Or we substitute the command list in-place, so that we still have the entire
> > completion script in one file.
>
> That defeats the whole point of my suggestion, as you would be overwriting
> the tracked file.
Ok, not in-place then. What I meant is something like this.
git-completion.bash.in:
completion script with placeholders for command list generation code and
static command list
git-command-list.sh:
bash-agnostic command list generation script
git-completion.bash.generate:
run git-command-list.sh and replace static command list placeholder in
git-completion.bash.in, also insert command list generation code into
git-completion.bash.in, write result to git-completion.bash
Whether or not the command list should be loaded dynamically can be decided
on a per-user basis using a configuration option.
A downside of this approach is that even if we do not need the static
command list, we still need to generate the completion script. I therefore
recommend we make this part of the normal build process.
Alternatively, we could source the command list code. But it's inconvenient
to copy two completion scripts and it will probably cause confusion among
users.
Clemens
^ permalink raw reply
* [PATCH v3] imap-send.c: fix compiler warnings for OpenSSL 1.0
From: Vietor Liu @ 2009-10-28 8:28 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Fixes some compiler warnings:
imap-send.c: In function ‘ssl_socket_connect’:
warning: assignment discards qualifiers from pointer target type
====================================================
OpenSSL Changes between 0.9.8 and 1.0:
*) Let the TLSv1_method() etc. functions return a 'const' SSL_METHOD
pointer and make the SSL_METHOD parameter in SSL_CTX_new,
SSL_CTX_set_ssl_version and SSL_set_ssl_method 'const'.
Signed-off-by: Vietor Liu <vietor@vxwo.org>
---
imap-send.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/imap-send.c b/imap-send.c
index 3847fd1..298aa80 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -281,9 +281,9 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
SSL_load_error_strings();
if (use_tls_only)
- meth = TLSv1_method();
+ meth = (SSL_METHOD *)TLSv1_method();
else
- meth = SSLv23_method();
+ meth = (SSL_METHOD *)SSLv23_method();
if (!meth) {
ssl_socket_perror("SSLv23_method");
--
1.6.5.2
^ permalink raw reply related
* Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option
From: David Aguilar @ 2009-10-28 9:00 UTC (permalink / raw)
To: Charles Bailey; +Cc: Scott Chacon, git list
In-Reply-To: <20091027230043.GA11607@hashpling.org>
On Tue, Oct 27, 2009 at 11:00:43PM +0000, Charles Bailey wrote:
> On Tue, Oct 27, 2009 at 03:36:49PM -0700, Scott Chacon wrote:
> > p4merge is now a built-in diff/merge tool.
> > This adds p4merge to git-completion and updates
> > the documentation to mention p4merge.
> > ---
>
> I approve (but haven't had a chance to test this). p4merge is a
> good mergetool, but now I'll have to find something else as an example
> that you need to use custom mergetool support for.
Ditto, looks good to me.
> 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^
So...
Tested-by: David Aguilar <davvid@gmail.com>
P.S. thanks for the patch, Scott.
Sorry I haven't gotten around to forking progit yet
but we did at least get Disney Animation to go with
git + github =)
http://github.com/wdas/ptex
(there's only some headers up there right now,
but we'll have more to share soon)
Have fun,
--
David
^ permalink raw reply
* [PATCH] mergetool--lib: add support for p4merge
From: Jay Soffian @ 2009-10-28 9:11 UTC (permalink / raw)
To: git; +Cc: Jay Soffian, David Aguilar, Shawn O . Pearce, Jeff King,
Junio C Hamano
Add native support for p4merge as a diff / merge tool. There are two
oddities. First, launching p4merge on Mac OS X requires running a helper
shim (which in turn is looked for in a couple common locations, as it's
very unlikely to be in PATH). Second, p4merge seems to require its file
arguments be absolute paths.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
As requested by an Android developer at GitTogether09.
Only tested on Mac OS X 10.6.1. Feedback from anyone running p4merge on other
OS's would be appreciated.
Documentation/git-difftool.txt | 2 +-
Documentation/git-mergetool.txt | 2 +-
git-mergetool--lib.sh | 44 ++++++++++++++++++++++++++++++++++++++-
3 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 96a6c51..8e9aed6 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -31,7 +31,7 @@ OPTIONS
Use the diff tool specified by <tool>.
Valid merge tools are:
kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
- ecmerge, diffuse, opendiff and araxis.
+ ecmerge, diffuse, opendiff, p4merge and araxis.
+
If a diff tool is not specified, 'git-difftool'
will use the configuration variable `diff.tool`. If the
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 68ed6c0..4a6f7f3 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -27,7 +27,7 @@ OPTIONS
Use the merge resolution program specified by <tool>.
Valid merge tools are:
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
- diffuse, tortoisemerge, opendiff and araxis.
+ diffuse, tortoisemerge, opendiff, p4merge and araxis.
+
If a merge resolution program is not specified, 'git-mergetool'
will use the configuration variable `merge.tool`. If the
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index bfb01f7..23b2816 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -7,6 +7,12 @@ merge_mode() {
test "$TOOL_MODE" = merge
}
+abspath() {
+ d=$(dirname "$1")
+ d=$(cd "$d" && pwd -P)
+ echo "$d/$(basename "$1")"
+}
+
translate_merge_tool_path () {
case "$1" in
vimdiff)
@@ -21,6 +27,19 @@ translate_merge_tool_path () {
araxis)
echo compare
;;
+ p4merge)
+ # Look for the Mac OS X P4Merge shim
+ for app_dir in "/Applications" "$HOME/Applications"
+ do
+ launchp4merge="$app_dir/p4merge.app/Contents/Resources/launchp4merge"
+ if type "$launchp4merge" > /dev/null 2>&1; then
+ echo "$launchp4merge"
+ return 0
+ fi
+ done
+ # Otherwise assume we're not on Mac OS X and just return p4merge
+ echo "$1"
+ ;;
*)
echo "$1"
;;
@@ -45,7 +64,7 @@ check_unchanged () {
valid_tool () {
case "$1" in
- kdiff3 | tkdiff | xxdiff | meld | opendiff | \
+ kdiff3 | tkdiff | xxdiff | meld | opendiff | p4merge | \
emerge | vimdiff | gvimdiff | ecmerge | diffuse | araxis)
;; # happy
tortoisemerge)
@@ -284,6 +303,29 @@ run_merge_tool () {
>/dev/null 2>&1
fi
;;
+ p4merge)
+ # At least on Mac OS X p4merge wants absolute paths
+ ABS_LOCAL=$(abspath "$LOCAL")
+ ABS_REMOTE=$(abspath "$REMOTE")
+ if merge_mode; then
+ ABS_MERGED=$(abspath "$MERGED")
+ touch "$BACKUP"
+ if $base_present; then
+ ABS_BASE=$(abspath "$BASE")
+ "$merge_tool_path" \
+ "$ABS_BASE" "$ABS_LOCAL" "$ABS_REMOTE" "$ABS_MERGED" \
+ >/dev/null 2>&1
+ else
+ "$merge_tool_path" \
+ "/dev/null" "$ABS_LOCAL" "$ABS_REMOTE" "$ABS_MERGED" \
+ >/dev/null 2>&1
+ fi
+ check_unchanged
+ else
+ "$merge_tool_path" "$ABS_LOCAL" "$ABS_REMOTE" \
+ >/dev/null 2>&1
+ fi
+ ;;
*)
merge_tool_cmd="$(get_merge_tool_cmd "$1")"
if test -z "$merge_tool_cmd"; then
--
1.6.5.2.74.g610f9.dirty
^ permalink raw reply related
* Re: [PATCH] mergetool--lib: add support for p4merge
From: Jay Soffian @ 2009-10-28 9:21 UTC (permalink / raw)
To: git
Cc: Jay Soffian, David Aguilar, Shawn O . Pearce, Jeff King,
Junio C Hamano, Scott Chacon
In-Reply-To: <1256721087-72534-1-git-send-email-jaysoffian@gmail.com>
On Wed, Oct 28, 2009 at 2:11 AM, Jay Soffian <jaysoffian@gmail.com> wrote:
> Add native support for p4merge as a diff / merge tool. There are two
> oddities. First, launching p4merge on Mac OS X requires running a helper
> shim (which in turn is looked for in a couple common locations, as it's
> very unlikely to be in PATH). Second, p4merge seems to require its file
> arguments be absolute paths.
>
> Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
> ---
Amusing. I didn't see Scott's patch.
But, in my testing, for things to work properly I needed to use
launchp4merge per:
http://kb.perforce.com/AllPerforceApplications/StandAloneClients/P4merge/CommandLineP..rgeOnMacOsX
And I also found things didn't work properly unless I provided an absolute path.
(Aside, the "right" way to launch p4merge, at least on 10.6 would be:
/usr/bin/open -b com.perforce.p4merge -W -n --args <args to p4merge...>
This way OS X's launch services would find p4merge.app wherever it is
on the user's system. But, I think some of these options to open are
10.6 specific and in practice looking in /Applications and
$HOME/Applications I think is a sane enough default.)
j.
^ permalink raw reply
* Re: [PATCH] mergetool--lib: add support for p4merge
From: David Aguilar @ 2009-10-28 9:27 UTC (permalink / raw)
To: Jay Soffian
Cc: git, Shawn O . Pearce, Jeff King, Junio C Hamano, Scott Chacon
In-Reply-To: <76718490910280221u4e1d3e78me7f9b0b45f590e56@mail.gmail.com>
On Wed, Oct 28, 2009 at 02:21:46AM -0700, Jay Soffian wrote:
> On Wed, Oct 28, 2009 at 2:11 AM, Jay Soffian <jaysoffian@gmail.com> wrote:
> > Add native support for p4merge as a diff / merge tool. There are two
> > oddities. First, launching p4merge on Mac OS X requires running a helper
> > shim (which in turn is looked for in a couple common locations, as it's
> > very unlikely to be in PATH). Second, p4merge seems to require its file
> > arguments be absolute paths.
> >
> > Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
> > ---
>
> Amusing. I didn't see Scott's patch.
Apologies Jay!
It's late and I saw Scott listed in the CC: and guessed wrong ;)
Thanks for the patch again, man. Good stuff.
>
> But, in my testing, for things to work properly I needed to use
> launchp4merge per:
>
> http://kb.perforce.com/AllPerforceApplications/StandAloneClients/P4merge/CommandLineP..rgeOnMacOsX
>
> And I also found things didn't work properly unless I provided an absolute path.
>
> (Aside, the "right" way to launch p4merge, at least on 10.6 would be:
>
> /usr/bin/open -b com.perforce.p4merge -W -n --args <args to p4merge...>
>
> This way OS X's launch services would find p4merge.app wherever it is
> on the user's system. But, I think some of these options to open are
> 10.6 specific and in practice looking in /Applications and
> $HOME/Applications I think is a sane enough default.)
>
> j.
--
David
^ permalink raw reply
* [PATCH] help -a: do not unnecessarily look for a repository
From: Gerrit Pape @ 2009-10-28 9:30 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Johannes Schindelin, git
In-Reply-To: <7viqe0yrnu.fsf@alter.siamese.dyndns.org>
Although 'git help -a' actually doesn't need to be run inside a git
repository and uses no repository-specific information, it looks for a
git directory. On 'git <TAB><TAB>' the bash completion runs 'git help
-a' and unnecessary searching for a git directory can be annoying in
auto-mount environments. With this commit, 'git help' no longer
searches for a repository when run with the -a option.
The fix is from Johannes Schindelin, the annoying behavior has been
reported by Vincent Danjean through
http://bugs.debian.org/539273
Signed-off-by: Gerrit Pape <pape@smarden.org>
---
On Tue, Oct 27, 2009 at 11:11:01PM -0700, Junio C Hamano wrote:
> Gerrit Pape <pape@smarden.org> writes:
> > Hi Junio, I suggest to apply this patch from Johannes to master.
> Could you help by coming up with a suitable log message?
>
> It's a bit too much to ask me to hunt for ancient discussion to
> correct the <<all the ack go here>> myself to describe what the
> issue was,
Sure, sorry for that. Regards, Gerrit.
builtin-help.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin-help.c b/builtin-help.c
index e1ade8e..ca08519 100644
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -417,9 +417,6 @@ int cmd_help(int argc, const char **argv, const char *prefix)
const char *alias;
load_command_list("git-", &main_cmds, &other_cmds);
- setup_git_directory_gently(&nongit);
- git_config(git_help_config, NULL);
-
argc = parse_options(argc, argv, prefix, builtin_help_options,
builtin_help_usage, 0);
@@ -430,6 +427,9 @@ int cmd_help(int argc, const char **argv, const char *prefix)
return 0;
}
+ setup_git_directory_gently(&nongit);
+ git_config(git_help_config, NULL);
+
if (!argv[0]) {
printf("usage: %s\n\n", git_usage_string);
list_common_cmds_help();
--
1.6.5.2
^ permalink raw reply related
* Re: [PATCH] mergetool--lib: add support for p4merge
From: David Aguilar @ 2009-10-28 9:36 UTC (permalink / raw)
To: Jay Soffian
Cc: git, Shawn O . Pearce, Jeff King, Junio C Hamano, Scott Chacon
In-Reply-To: <76718490910280221u4e1d3e78me7f9b0b45f590e56@mail.gmail.com>
On Wed, Oct 28, 2009 at 02:21:46AM -0700, Jay Soffian wrote:
>
> But, in my testing, for things to work properly I needed to use
> launchp4merge per:
>
> http://kb.perforce.com/AllPerforceApplications/StandAloneClients/P4merge/CommandLineP..rgeOnMacOsX
>
> And I also found things didn't work properly unless I provided an absolute path.
>
> (Aside, the "right" way to launch p4merge, at least on 10.6 would be:
>
> /usr/bin/open -b com.perforce.p4merge -W -n --args <args to p4merge...>
:(
I tested on 10.5, so there's definitely some difference in
behavior since difftool.p4merge.path is all that was needed here
(with an absolute path as I mentioned).
> This way OS X's launch services would find p4merge.app wherever it is
> on the user's system. But, I think some of these options to open are
> 10.6 specific and in practice looking in /Applications and
> $HOME/Applications I think is a sane enough default.)
We've stayed away from hard-coding any platform-specific paths
in mergetool--lib in the past. It's a practicality thing --
trying to guess all of the possible installation locations is
simply untenable.
Here's an old thread where we talked about this in the context
of ecmerge:
http://thread.gmane.org/gmane.comp.version-control.git/118125/focus=118182
Let me know what you think.
--
David
^ permalink raw reply
* [PATCH] bash completion: difftool accepts the same options as diff
From: Markus Heidelberg @ 2009-10-28 9:45 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Junio C Hamano, git, David Aguilar, Markus Heidelberg
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>
---
contrib/completion/git-completion.bash | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d3fec32..45369e2 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -958,6 +958,8 @@ __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
_git_difftool ()
{
+ __git_has_doubledash && return
+
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
--tool=*)
@@ -965,11 +967,15 @@ _git_difftool ()
return
;;
--*)
- __gitcomp "--tool="
+ __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
+ --base --ours --theirs
+ --no-renames --diff-filter= --find-copies-harder
+ --relative --ignore-submodules
+ --tool="
return
;;
esac
- COMPREPLY=()
+ __git_complete_file
}
__git_fetch_options="
--
1.6.5.2.86.g61663
^ permalink raw reply related
* Re: [PATCH] mergetool--lib: add support for p4merge
From: Jay Soffian @ 2009-10-28 9:52 UTC (permalink / raw)
To: David Aguilar
Cc: git, Shawn O . Pearce, Jeff King, Junio C Hamano, Scott Chacon
In-Reply-To: <20091028093655.GC90780@gmail.com>
On Wed, Oct 28, 2009 at 2:36 AM, David Aguilar <davvid@gmail.com> wrote:
> I tested on 10.5, so there's definitely some difference in
> behavior since difftool.p4merge.path is all that was needed here
> (with an absolute path as I mentioned).
There are two issues here:
1) Is it necessary to use launchp4merge, or is calling p4merge directly okay:
Calling p4merge directly works, but the advantage of calling
launchp4merge instead is that it works a little more elegantly:
- If p4merge is already running, using launchp4merge opens a new
window inside the running instance, instead of launching p4merge
anew.
- After performing the merge, it is sufficient to just close the merge
window, as opposed to having to quit the p4merge application (which
you have to do if you run p4merge directly).
2) Does p4merge/launchp4merge require absolute paths for its arguments.
I found that it does. So I wonder whether possibly you tested with
difftool, which uses absolute arguments, as opposed to mergetool,
which uses relative arguments. You'd only see the issue with
mergetool.
> We've stayed away from hard-coding any platform-specific paths
> in mergetool--lib in the past. It's a practicality thing --
> trying to guess all of the possible installation locations is
> simply untenable.
>
> Here's an old thread where we talked about this in the context
> of ecmerge:
>
> http://thread.gmane.org/gmane.comp.version-control.git/118125/focus=118182
>
> Let me know what you think.
Disagree with the conclusion of that thread. On Linux, PATH is very
likely to have the merge/diff binary in it. On OS X, this is highly
unlikely, but there are two very common/likely locations we can look,
/Applications and $HOME/Applications.
j.
^ permalink raw reply
* Re: [PATCH] mergetool--lib: add support for p4merge
From: Jay Soffian @ 2009-10-28 10:02 UTC (permalink / raw)
To: David Aguilar
Cc: git, Shawn O . Pearce, Jeff King, Junio C Hamano, Scott Chacon
In-Reply-To: <76718490910280252n7a2c41baj5e220c784f1f3617@mail.gmail.com>
On Wed, Oct 28, 2009 at 2:52 AM, Jay Soffian <jaysoffian@gmail.com> wrote:
> 2) Does p4merge/launchp4merge require absolute paths for its arguments.
>
> I found that it does.
I lie. Running p4merge directly works with relative paths. Launching
p4merge via launchp4merge (or via open) requires absolute paths, which
I guess makes sense.
I'd still lean toward using launchp4merge with absolute paths.
$0.02.
j.
^ permalink raw reply
* Re: [RFC PATCH v3 10/17] Move WebDAV HTTP push under remote-curl
From: Tay Ray Chuan @ 2009-10-28 11:01 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Daniel Barkalow, Mike Hommey
In-Reply-To: <20091028010831.GP10505@spearce.org>
Hi,
On Wed, Oct 28, 2009 at 9:08 AM, Shawn O. Pearce <spearce@spearce.org> wrote:
> Isn't the style I have here the standard way of adding a second
> paragraph to a list item?
sorry, I didn't catch the '+'-line style.
> I folded your patches into my series, thanks.
You're welcome.
--
Cheers,
Ray Chuan
^ permalink raw reply
* Headless tags don't have a follows or precedes?
From: Tim Mazid @ 2009-10-28 11:36 UTC (permalink / raw)
To: git
Hi all,
I've noticed that if I create a headless tag (one that doesn't have a
branch, right?), when I click on that commit, it doesn't have precedes or
follows information. Is this by design? Is there a work-around I can use
without creating a branch there?
Thanks,
Tim.
--
View this message in context: http://www.nabble.com/Headless-tags-don%27t-have-a-follows-or-precedes--tp26093136p26093136.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* [PATCH v2] gitk: Use the --submodule option for displaying diffs when available
From: Jens Lehmann @ 2009-10-28 11:40 UTC (permalink / raw)
To: Paul Mackerras, Junio C Hamano; +Cc: Git Mailing List
In-Reply-To: <19175.49800.697048.349753@drongo.ozlabs.ibm.com>
Instead of just showing not-quite-helpful SHA-1 pairs in the diff display
of a submodule gitk will display the first lines of the corresponding
commit messages (similar to the output of 'git submodule summary') when
the underlying git installation supports this. That makes it much easier
to evaluate the changes, as it eliminates the need to start a gitk inside
the submodule and use the superprojects hashes there to find out what the
commits are about.
This patch applies to 'next' - which will be 1.6.6 or 1.7.0 when merged -
and uses the new --submodule option of git diff when a version of 1.6.6 or
higher is detected to achieve a more human readable output of submodule
differences in gitk.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---
Thanks for the review of the first version of this patch. I tried to
address all the issues raised and moved the additions of the --submodule
flag to the getblobdiffs procedure, where the --textconv flag is handled
too.
gitk-git/gitk | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index a0214b7..b06cac7 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -7343,7 +7343,11 @@ proc getblobdiffs {ids} {
if {[package vcompare $git_version "1.6.1"] >= 0} {
set textconv "--textconv"
}
- set cmd [diffcmd $ids "-p $textconv -C --cc --no-commit-id -U$diffcontext"]
+ set submodule {}
+ if {[package vcompare $git_version "1.6.6"] >= 0} {
+ set submodule "--submodule"
+ }
+ set cmd [diffcmd $ids "-p $textconv $submodule -C --cc --no-commit-id -U$diffcontext"]
if {$ignorespace} {
append cmd " -w"
}
@@ -7481,6 +7485,21 @@ proc getblobdiffline {bdf ids} {
set diffnparents [expr {[string length $ats] - 1}]
set diffinhdr 0
+ } elseif {![string compare -length 10 "Submodule " $line]} {
+ # start of a new submodule
+ if {[string compare [$ctext get "end - 4c" end] "\n \n\n"]} {
+ $ctext insert end "\n"; # Add newline after commit message
+ }
+ set curdiffstart [$ctext index "end - 1c"]
+ lappend ctext_file_names ""
+ set fname [string range $line 10 [expr [string last " " $line] - 1]]
+ lappend ctext_file_lines $fname
+ makediffhdr $fname $ids
+ $ctext insert end "\n$line\n" filesep
+ } elseif {![string compare -length 3 " >" $line]} {
+ $ctext insert end "$line\n" dresult
+ } elseif {![string compare -length 3 " <" $line]} {
+ $ctext insert end "$line\n" d0
} elseif {$diffinhdr} {
if {![string compare -length 12 "rename from " $line]} {
set fname [string range $line [expr 6 + [string first " from " $line] ] end]
--
1.6.5.2.182.g3d976.dirty
^ permalink raw reply related
* Re: drawbacks to svn server + git-svn vs git server?
From: Tim Mazid @ 2009-10-28 11:53 UTC (permalink / raw)
To: git
In-Reply-To: <25994334.post@talk.nabble.com>
Hi,
I recently migrated from svn to git as well, but I've abandoned the svn
server altogether.
What I noticed is that the merges do not show up properly when you look at
the svn repo with git. Obviously because svn doesn't track that information.
I assume that such a problem would continue if you continued using the svn
server.
Personally, i would recommend migrating to git altogether, it isn't actually
that difficult. The only issue I had was fixing up the merges.
Sorry I can't be of more help, I'm just letting you know what issues I faced
with svn.
Good luck,
Tim.
Dexter Riley wrote:
>
> 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? I know
> that the git repository would be smaller. I'm more concerned about
> possible svn repository corruption, performance when pushing large merges
> back to svn, and any gotchas you might have encountered.
> Any advice would be greatly appreciated.
> Thanks,
> Ed
>
--
View this message in context: http://www.nabble.com/drawbacks-to-svn-server-%2B-git-svn-vs-git-server--tp25994334p26093326.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: merge confusion
From: Tim Mazid @ 2009-10-28 12:01 UTC (permalink / raw)
To: git
In-Reply-To: <24755682.post@talk.nabble.com>
thepurpleblob wrote:
>
> I had some unexpected behaviour doing a merge today. I wonder if anybody
> can tell me where I have gone wrong. This is the sequence...
>
> * clone a remote repo
> * created a local branch to track one of the remote branches
> * did work on the local branch and then created another 'feature' branch
> from that
> * time elapsed and at some point(s) I pulled from the remote but did not
> merge the original local branch
> * finished feature, checkout local branch and merge in feature.
>
> What I didn't expect is that all the subsequent changes on the tracked
> remote branch got merged in too. Which I didn't want.
> So the question is - is that what's supposed to happen (ie. if you do any
> merge the tracked branch 'fast forwards' the remote) and, if so, if I want
> a branch that stays a branch (doesn't ever merge with the remote) how
> would I do that?
>
> Thanks!
>
Did you 'git pull' or 'git fetch'? 'git pull' automatically merges, where
'git fetch' only gets the data.
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.
Good luck,
Tim.
--
View this message in context: http://www.nabble.com/merge-confusion-tp24755682p26093419.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Updating a branch.
From: Tim Mazid @ 2009-10-28 12:03 UTC (permalink / raw)
To: git
In-Reply-To: <26015707.post@talk.nabble.com>
elyod72 wrote:
>
> I am a newbie to git, so please bear with me.
> Here is the scenario that I am struggling with:
>
> I have my Master branch.
> I then create a new branch named Test.
> I then make changes and additions to the test branch.
> At the same time I make changes to the Master branch.
> Now I want to update the Test branch with the latest information from the
> Master branch.
>
> How do I go about doing that?
>
> Thanks for you time and help.
>
I'm a newbie too, don't worry. :P
And what you're describing is pretty simple.
Just do
git checkout Test
git merge Master
Voila. :P
Obviously, if there are any conflicts, you'll have to resolve them with 'git
mergetool'.
Good luck,
Tim.
--
View this message in context: http://www.nabble.com/Updating-a-branch.-tp26015707p26093449.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: How do I see all of my changes on a branch?
From: Tim Mazid @ 2009-10-28 12:08 UTC (permalink / raw)
To: git
In-Reply-To: <25879435.post@talk.nabble.com>
jonhud wrote:
>
> Hi,
>
> We are using github (but that's more or less irrelevant, since I'm just
> running git 1.6 locally on Ubuntu). Some time ago, I created a new branch
> (release.2.2) and pushed it out to the remote repository. All the digging
> through log, gitk, etc. has not made it possible for me to figure out the
> commit (or point in time) at which I cut the branch.
>
Um, unfortunately, all the commits that are prior to HEAD count as being on
the branch.
Have you tried using 'gitk --all' to look through? You should be able to see
the split point there.
jonhud wrote:
>
> What I want to do is to get a list of files (and/or diffs for those files)
> from that point in time to HEAD on the branch. I understand that git-diff
> --name-only is part of the solution. What I can't figure out is how to
> pinpoint the first commit. So that's my first question... how do I do
> that?
>
Once you've found the commit, you can 'git diff COMMIT', or you can even,
straight in gitk, (make sure you have your branch selected), right click on
the commit and select 'diff this->selected'.
jonhud wrote:
>
> To complicate things, I was also working on a side branch which I merged
> to master before cutting the release.2.2 branch. In the best of all
> worlds, I would trace my changes back to the point at which I cut *that*
> branch and follow through the HEAD of release.2.2. How do I do that? I
> know I might have to take 2 passes, one for release 2.2 and one for the
> side branch and that's OK.
>
> Thanks!
>
> Jon
>
The same method should work for that as well.
Good luck,
Tim.
--
View this message in context: http://www.nabble.com/How-do-I-see-all-of-my-changes-on-a-branch--tp25879435p26093515.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Is it possible to use git as a remote file storage without making any local repos?
From: Matvejchikov Ilya @ 2009-10-28 12:09 UTC (permalink / raw)
To: git
Hi all,
My question is about using git as a remote file storage.
I have a remote storage server with a git-daemon running and I want to
be able to put some data in that repo
in a way like 'git hash-object -w <object>'. The general problem for
me is that I don't want to create any local
git repositories that is needed by 'pit push ...' etc.
So, is it possible to use git for remote storage purposes without
making local repository?
Thanks.
^ 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
* 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: 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: 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
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