I think the presentation order is still screwy. Before saying what it does, let's state why the reader might want to use what we are going to describe, so that the reader can say "I am not in that situation, I do not have to read the rest" and skip the document quickly. When you want to include contents in your project from another project that has started its life independently, you can do so by merging the other project into your project. If there is no (and more importantly...

Note that the space nor time performance of compressing and uncompressing a single huge blob is not as interesting in the context of git as compressing/uncompressing millions of small pieces whose total size is comparable to the specimen of "huge single blob" experiment. Obviously loose object files are compressed individually, and packfile contents are also individually and independently compressed. Set-up cost for individual invocation of compression and uncompression on smaller data matters a...

For the compression type detection, I was hoping that we could do something like sha1_file.c::legacy_loose_object(), but I tend to agree it is not probably worth it. -

Now 100% complete (163 strings). Signed-off-by: Christian Stimming <stimming@tuhh.de> =2D-- Additionally attached in gzip'd form to avoid encoding=20 or whitespace problems. po/de.po | 418 +++++++++++++++++++++++++++++++++-------------------------= =2D--- 1 files changed, 220 insertions(+), 198 deletions(-) diff --git a/po/de.po b/po/de.po index d7881dd..5ee2fca 100644 =2D-- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-...

Thanks for raising a very good point. Yes, some commands inherently wants depth first. While I agree that making a recursive is a grave usage error (submodule commit and toplevel commit are logically different events and even their commit log message should be different, as they talk about changes in logically different levels) from project management point of view, I do not think it is something a tool has to explicitly forbid the users to do. I view it as a kind of a long rope, a misuse th...

Hi, I think the truth is that CRLF was a mistake. Nobody wants to take the blame for it, obviously, but more and more Windows tools just grok LF-only text. The question is: what to do with those that cannot grok LF-only text. I imagine that the best compromise for now would be to have crlf=true, with poor souls like Steffen having to set the gitattributes accordingly. Ciao, Dscho -

Thanks. I rephrased the above (three almost identical lines) to: 56752391a8c0c591853b276e4fa0b45c34ced181 (Make "git gc" pack all refs by default) changed the default of gc.packrefs to true, to pack all refs by default in any repository. IOW, the users need to disable it explicitly if they want to by setting the config variable, since 1.5.3. However, we forgot to update the documentation. This fixes it. and applied. -

When I rebase series with bad whitespace, I end up with unhelpful messages like: .dotest/patch:412: trailing whitespace. -- .dotest/patch:446: trailing whitespace. -- These line numbers obviously refer to lines in a file that's been removed by the time I can do anything about it. It seems to me like the message would be more useful if, in the case where it leaves the working tree modified with the non-compliant whitespace, it gave this location rather than the patch's location (because,...

The message is more appropriate for a workflow to "git apply --check" In such a case, "git diff" will highlight the non-compliant whitespace. More problematic is if you used whitespace=warn to let it commit anyway. You can use "git diff $beginning_of_series..HEAD" the same way to locate the breakages, but you then need to do "rebase -i" to fix it up (I personally would run "format-patch", fix the problems in the patch text, and run "am", instead of "rebase -i", mostly because I am used to worki...

The po2msg.sh script and the .gitignore in the po directory have been shamelessly copied from the current git-gui. This enables the top level "make NO_MSGFMT" to work consistently for git across the git-gui and gitk sub-projects. This is the same effective patch that has previously been posted as a git.git patch which more succinctly described the copying of po/.gitignore and po/po2msg.sh from git-gui. Signed-off-by: Charles Bailey <charles@hashpling.org> --- Makefile | 7 +++- ...

Hi, Since gitk and git-gui are separate projects (pulled at irregular intervals into git.git), your patch looks sane, but would be better done as a patch against gitk.git. Ciao, Dscho -

Hi, Oh, my critique was not meant as harsh as it was apparently received: for reviewing purposes, your way was perfect, as it shows your intent better than the technically correct patch. All I'm saying is that you should send the (verbose) patch, too, possibly referring to the smaller patch in the space between the three dashes and the diffstat. (I would also prefix this patch with "gitk:", instead of writing "of gitk", so that people reading the log of git.git get a better idea what ...

I view the usage emitted by a command primarily as a quick reminder for people who are _already_ familiar with the command to help "was the option this command takes --foo or --bar? I can never remember which X-<" situation. The usage string is not a replacement of the manual page. For that reason, I generally prefer short and sweet one line usage for the whole command, even if it does not exactly capture mutually incompatible option combinations, _as long as_ the command itself is simple en...

A possible extension is to specifiy "inter-submodule" paths to the init subcommand, i.e. for a possible KDE layout: git submodule -r init kdelibs kdelibs/admin This should then recursively initialize the kdelibs submodule and the admin-submodule (in the kdelibs submodule). Btw: from my reading of the code, the git-command specified for 'recurse' will be done top-to-bottom: I guess that's what you want for something like 'git submodule recurse diff', but not for something like 'git submodul...

Doesn't the patch make some if not all of the above variables Does the remaining code still use $add? -

There were a couple of things I noticed that made me somewhat curious: * There are more spaces around ?= in Christian's patch to Makefile. * You have two patches from Christian and one patch from Gerrit; the author and commit timestamps of these commits are the same and in your timezone. but nothing to complain about. Pulled and pushed out. -

Hi, IMHO this is really not good. Better do it in the global /etc/gitconfig The problem is that MinGW behaves sanely, i.e. it does not output CRLF but only LF. Besides, as I stated several times already, there _are_ projects on Windows where you do _not_ want crlf=true: - Windows is already slow. So slow that it is not even funny. Granted, if you use Windows daily, git on MinGW seems snappy, but if you come from Linux, it is slow as hell. And CRLF conversion does not help ...

Eric, the change is very limited in scope (only the parameter to ra->get_dir() changes) so I can apply myself, if you agree this is a trivially correct fix. I just do not know svn-perl -

From: Imran M Yousuf <imyousuf@smartitengineering.com> - The purpose of the recurse command in the git submodule is to recurse a command in its submodule at depths specified. For example if one wants to do a diff on its project with submodules at once, one can simply do git-submodule recurse diff HEAD and would see the diff for all the modules it contains. If during recursion it is found that a module has not been initialized or updated than the command also initializes and updates the...

- Previously 'git submodule' was equvalent to 'git submodule status', now it is an error. - Previously, passing --cached to add, init, or update was an error, now it is not. -- Hannes -

--cached only makes sense for the status subcommand, so the usage/manpage probably should have looked like this (except for the whitespace mangling...): diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index cffc6d4..331e806 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -10,7 +10,10 @@ SYNOPSIS -------- [verse] 'git-submodule' [--quiet] [-b branch] add <repository> [<path>] -'git-submodule' [--quiet] [--cache...

I think for this patch I will keep the usage intact and keep the implementation coherent with the current usage and add a comment in -- Imran M Yousuf -

-- Hannes of them. "that mistake" with no clue on which one you mean when I pointed out three BTW, on this list we don't top-post. In particular not when you write only [...] -

Hi all, For some time I have been working on a GUI for DVCS systems, which I have named Push Me Pull You (PMPU). At its core is a GUI for viewing Incoming / Outgoing changesets. It also includes support for initiating pulls / pushes, doing clones, etc. Eventually I hope to provide access to much more functionality. My "native" DVCS is Mercurial and I'm rather new to git's way of doing things, although it is similar in many respects. PMPU is intended to support multiple DVCS systems; cu...

Aside from this message being inappropriate as a proposed commit log message, I think what the patch tries to achieve is a worthy UI improvement. I would have removed those empty lines around the instruction if I were patching this, though. Losing 5 lines out of 25-line terminal was marginally Ok. Losing 9 lines 4 lines too many and is unacceptable. -