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...

Ah, I see. I did think about using the config variable for those tests, but it felt too much like testing two things at once. That is, it is nicer to debug if each test breaks only when the thing it is testing for is broken, not some other random unrelated feature. Obviously that isn't always possible, but it seemed kind of clumsy to me. Anyway, with a default of "warn" the tests don't need any update at all (and do serve as a test that we still haven't broken people), and I can pass the decision...

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

Well, I suggested putting "src/public/public_header.h" quite early on, with private headers next to the source. AFAIU, the private and public headers both are now located in the same directory, and that directory is separate from the .c files. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 --

That one. So PlaceWindow is NOT called. --

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. --

Still missing (neither video, nor slides, nor description, nor email) + What was the difference between "Tim: Large media in Git (Repeat)" from Wed, and earlier "Tim: Git as a Media Repository" from Tue? -- Jakub Narebski Poland --

Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- Documentation/rev-list-options.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 966276b..68a253f 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -285,7 +285,7 @@ See also linkgit:git-reflog[1]. History Simplification ~~~~~~~~~~~~~~~~~~~~~~ -When optional paths are give...

Greedy operators are only supported with perl 5.10 or more... I think it's a bad idea to use them... -- Francis Galiegue ONE2TEAM Ingénieur système Mob : +33 (0) 6 83 87 78 75 Tel : +33 (0) 1 78 94 55 52 fge@one2team.com 40 avenue Raymond Poincaré 75116 Paris --

I don't know about MacOS, but in Linux it does seem unnecessary, so: --- >8 --- Subject: [PATCH] gitk: Explicitly position popup windows. For some reason, on Windows all transient windows are placed in the upper left corner of the screen. Thus, it is necessary to explicitly position the windows relative to their parent. For simplicity this patch uses the function that is used internally by Tk dialogs. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> --- gitk | 29 ++++...

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...

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...

The user might need to see the key before cloning a repository. This patch makes the relevant menu item available in the Select Repository/Clone dialog. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> --- git-gui.sh | 20 +++++++++++--------- lib/choose_repository.tcl | 6 ++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 12b496b..cf9ef6e 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -999,6 +999,17 @@ citool ...

What I meant here (but perhaps was not clear) was (ab)using submodules to allow to have full working repository without large [media] files both in object database (repository) and without them checked out. The workaround is to put all large files for example in 'media/' folder, and make this folder be submodule. Each clone of repository can have this 'media' submodule either present (both in object database, although usually separate from main project object database), or not present (not cloned...

Thanks. Added to http://git.or.cz/gitwiki/GitTogether (even if I cannot view them in my old web browser). -- Jakub Narebski Poland --

These are patches to fast-import/git-p4, which you two seem to in charge of. From: John Chapman <thestar@fussycoder.id.au> Subject: [PATCH 1/2] Added support for purged files and also optimised memory usage. Date: Sat, 8 Nov 2008 14:22:48 +1100 Message-Id: <1226114569-8506-1-git-send-email-thestar@fussycoder.id.au> From: John Chapman <thestar@fussycoder.id.au> Subject: [PATCH 2/2] Cached the git configuration, which is now noticibly faster on windows. ...

Please read Documentation/SubmittingPatches for the preferred way to Newer asciidoc versions have the following "workaround". Maybe adding something like this to Documentation/asciidoc.conf would be more future proof. # -- Spaced and unspaced em dashes (entity reference —) # But disallow unspaced in man pages because double-dash option name prefixes # are pervasive. ifndef::doctype-manpage[] (^|[^-\\])--($|[^-])=\1—\2 endif::doctype-manpage[] ifdef::doctype-manpage[] (...

Thanks. --

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. --

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

Look at the results of 'git merge' and 'git merge --no-ff' in gitk. Or, compare the resultant sha1 for the two commit objects. Or, look at 'git log' of the resulting commit objects, and look for a 'Merge:' line. Deskin Miller --

My bad. Here's the published, no-login-required version: http://docs.google.com/Presentation?id=dhhs72s2_1wtzbnsnj -Steve --

Thanks. Added to http://git.or.cz/gitwiki/GitTogether -- Jakub Narebski Poland --

Thanks, will apply to 'maint'. --

Thanks; will be in 'next'. --