Thanks; will apply to 'maint'. --

The example that tells users how to centralize the effort of the initial git svn clone operation doesn't work properly. It uses rebase but that only works if HEAD exists. This adds one extra command to create a somewhat sensible HEAD that should work in all cases. Signed-off-by: Jan Krüger <jk@jk.gs> --- I have a feeling this looks a bit ugly, but I can't think of a simpler solution (especially since we're not fetching the central repo's HEAD). Still, it's certainly better than a broken exa...

The blame builtin now supports automatic conversion of metadata encoding. By default it is converted to the character set specified by i18n.logoutputencoding. Since gui blame expects the data in utf-8, it is necessary to specify the desired encoding directly. An old version of the blame command will simply ignore the option. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> --- lib/blame.tcl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/blame.tcl...

Now that the blame viewer has a search panel, it should be taken into account by the focus transition code. Otherwise showing a commit tip (by accidentally moving the mouse to the text frame) causes the focus to transfer away from the search field. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> --- lib/blame.tcl | 16 ++++++++++++---- lib/search.tcl | 14 +++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lib/blame.tcl b/lib/blame.tcl index 765...

is there any way to force a merge conflict? there are 2 projects which have basically diverged becoming incompatible, and both have updated since there common ancestry. I'm working slowing on merging them back together. in this case I have a dev branch and fork branch the fork is a copy of dev except I committed one of the files from the fork. I need to merge this file back into dev, but git thinks it's a fast forward, because it really is for git, in reality it isn't, both files have newer hist...

I tried that but I don't see that it's any different than a fast forward in this scenario. Actually I don't see any difference between it and a fast-forward. -- Caleb Cushing --

This commit fixes two problems with commit encodings: 1) git-log actually uses i18n.logoutputencoding to generate its output, and falls back to i18n.commitencoding only when that option is not set. Thus, gitk should use its value to read the results, if available. 2) The readcommit function did not process encodings at all. This led to randomly appearing misconverted commits if the commit encoding differed from the current locale. Now commit messages should be displayed correctl...

Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- Documentation/git-bisect.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index c7981ef..39034ec 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -26,7 +26,7 @@ on the subcommand: git bisect log git bisect run <cmd>... -This command uses 'git-rev-list --bisect' to help drive the +This command...

Sometimes specifying the recipient addresses can be tedious on the command-line. This commit will allow the user to edit the recipient addresses in their editor of choice. Signed-off-by: Ian Hilt <ian.hilt@gmx.com> --- This is on top of Pierre's most recent series. I'm not exactly happy with the way it turned out, but it seems to function correctly. Comments are most welcome. [ This is a resend. I don't know what happened to the first mail I sent to the list. ] git-send-email...

The problem here was that a space should follow the field, but it may not. The user may unwarily backup over it. "\s*" would match this case. But if there is a space, it is included in the "(.+)". So I tried "\s+", which did not include the space, but it won't include the first address if there isn't a space after the field. The quantified subpattern seemed to do the trick. But, if it could result in a dependency issue, I would agree this would be a bad idea. =09Ian

Why have we ended up losing the most important Cc: to the original patch submitter who asked if the idea of his patch is sound? --

Not necessary. Please remember that you can configure gitweb to either use _alternate_ stylesheet (instead of provided gitweb.css), or use _additional_ stylesheet (for example gitweb-commit.css in addition to No, they are 'post-processed': finding correct action is left to _after_ you click on the link (it is more natural, and helps performance). If you don't know action for given SHA-1 you can use either http://example.com/gitweb.cgi?a=object;h=deadbeef which finds correct type (for e...

Do such git shirts exist already and could be ordered somewhere? I might be interested in buying one. Cheers, jlh --

JGit slides: http://www.spearce.org/2008/11/JGit.pdf Pack v4 slides: http://www.spearce.org/2008/11/Pack_v4.pdf I also had these as a Google Doc, but its internal on the google.com domain so I can't easily publish it. Plus PDF is probably more portable to older browsers than the Google Docs site is. :-) -- Shawn. --

Here are the slides from David's and my talk: http://docs.google.com/Presentation?id=dhhs72s2_1wtzbnsnj&invite=v4t8kr -Steve --

No, its not. The owner of the document can publish the document, making it world-readable, *without* needing a login. I think they just forgot to do that on this particular presentation. Steven, can you publish that doc, so it doesn't require login to read? -- Shawn. --

Would it be possible to publish PDF version sowehere, for example as attachement to http://git.or.cz/gitwiki/GitTogether? My old web browser doesn't support Google Docs... -- Jakub Narebski Poland --

Interesting. How would you use submodules to work around the fact that bina= ry=20 file changes diff very bad and produce huge histories with basically no val= ue=20 for the user of the working copy? Can you do this from a GUI, easily? We're= =20 talking about media repositories here, so our users are artists. Cheers, Kai =2D-=20 Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member [ message continues ]

Tim was talking about that media/ folder and managing that in git. If you w= ant=20 to work on the media, you might end up getting hundreds of gigabytes of dat= a=20 to get that folder, even if you only need to change one single file. That's the issue we're running into, and I don't thing submodules solve thi= s=20 at all. Cheers, Kai =2D-=20 Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member [ message continues ]

Hi, Yes, that's exactly what happened, and it won't likely happen again. Thanks for fixing and for the Cc. -Jan --

Same thing done the right way. regards, P. On Fri, Nov 7, 2008 at 04:09, Piotr Findeisen <piotr.findeisen@gmail.com> w=

Oh, I am. But it is just so convenient to have range support for commands which just show commits. Besides, git-show just errors out, instead of producing the commits like git-log does. --

Maybe another use case: encrypted blobs (those are generally unavailable until corrected password is given, so they are "holes" in checkout/clone). It could be used to store sensitive content (in $HOME for example) -- Duy

Do you mean "please add the if statement", i.e. don't call tk::PlaceWindow under Linux? Like Johannes Sixt, I find your request ambiguous. :) Paul. --

For some reason it didn't work. Maybe I did something wrong. --- >8 --- Subject: [PATCH] gitk: Add accelerators to frequently used menu commands. This commit documents keyboard accelerators used for menu commands in the menu, as it is usually done, and adds some more, e.g. F4 to invoke Edit View. The changes include a workaround for handling Shift-F4 on systems where XKB binds special XF86_Switch_VT_* symbols to Ctrl-Alt-F* combinations. Tk often receives these codes when Shift-F* is p...