Re: [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'

t; > +The fourth syntax ("`git merge --continue`") can only be run after the > +merge has resulted in conflicts. 'git merge --continue' will take the > +currently staged changes and complete the merge. I think this should mention the equivalence to 'git commit'. Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/

Re: Resend: Gitk: memory consumption improvements

Am 09.12.2016 um 18:57 schrieb Stefan Beller: > On Fri, Dec 9, 2016 at 3:51 AM, Markus Hitter wrote: >> >> It's a month now since I sent three patches to this list for reducing memory >> consumption of Gitk considerably: >> >> https://public-inbox.org

Resend: Gitk: memory consumption improvements

r "what's cooking" post either. Anything missing? I'd like to put a 'done' checkmark behind this. Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/

Re: [PATCH 5/6] config docs: Provide for config to specify tags not to abbreviate

reference types. Then one would create such interesting tags with git tag -i or git tag --interesting To reduce the backwards compatibility problem these itags could be stored in .git/refs/tags as well, itag-aware tools would sort the duplicates out. Markus -- - - - - - - - - - - -

Re: [PATCH 0/3] gitk: memory consumption improvements

http://core.tcl.tk/tk/info/549d2f56757408f3 Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/

Re: Bug: git config does not respect read-only .gitconfig file

res additional code, so it'd be interesting to know why this code was added. The relevant commit in the git.git repo should tell. Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/

Re: [PATCH 0/6] Provide for config to specify tags not to abbreviate

rce long names just means they're not cut off by the abbreviation algorithm, but by the right boundary of the visible area. My $0.02, Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/

[PATCH 3/3] gitk: clear array 'commitinfo' on reload

>From 8359452f426c68cc02250f25f20eaaacd2ddd001 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Mon, 7 Nov 2016 19:02:51 +0100 Subject: [PATCH 3/3] gitk: clear array 'commitinfo' on reload After a reload we might have an entirely different set of commits, so keeping all of them

[PATCH 2/3] gitk: remove closed file descriptors from $blobdifffd

>From 0a463fcd977dc9558835c373e24a095e35ca3c82 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Mon, 7 Nov 2016 16:01:17 +0100 Subject: [PATCH 2/3] gitk: remove closed file descriptors from $blobdifffd One shouldn't have descriptors of already closed files around. The first idea to d

[PATCH 1/3] gitk: turn off undo manager in the text widget

>From e965e1deb9747bbc2b40dc2de95afb65aee9f7fd Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Sun, 6 Nov 2016 20:38:03 +0100 Subject: [PATCH 1/3] gitk: turn off undo manager in the text widget The diff text widget is read-only, so there's zero point in building an undo stack. Thi

[PATCH 0/3] gitk: memory consumption improvements

and - forget the 'commitinfo' array on a reload to enforce reloading it. I hope this finds you appreciation. Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/

Re: gitk: avoid obscene memory consumption

es } variableSizes -->8--- [memory info] requires a Tcl with memory debug enabled. Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/

Re: gitk: avoid obscene memory consumption

Am 05.11.2016 um 12:08 schrieb Paul Mackerras: > On Fri, Nov 04, 2016 at 03:45:09PM -0700, Stefan Beller wrote: >> On Fri, Nov 4, 2016 at 12:49 PM, Markus Hitter wrote: >>> >>> Hello all, >> >> +cc Paul Mackeras, who maintains gitk. > > Thanks. >

gitk: avoid obscene memory consumption

ring range $a 0 7]"] @@ -9114,6 +9140,7 @@ set blobdifffd($diffids) $fd set diffinhdr 0 set currdiffsubmod "" +set parseddifflines 0 filerun $fd [list getblobdiffline $fd $diffids] } Cheers, Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/

Re: Git on Mac OS X 10.4.10

e wrong thing to do. Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/ # git Makefile configuration, included in main Makefile # config.mak.autogen. Generated from config.mak.in by configure. CC = cc CFLAGS = -g -O2 CPPFLAGS = LDFLAGS = AR = ar TAR = tar DIFF = diff P

Re: Git on Mac OS X 10.4.10

(uname_R)" : '[15678]\.'),2) > OLD_ICONV = UnfortunatelyYes > + NO_APPLE_COMMON_CRYPTO = YesPlease > endif > ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2) > NO_STRLCPY = YesPlease > -- - - - -

Re: Git on Mac OS X 10.4.10

Am 14.08.2014 um 16:39 schrieb Torsten Bögershausen: > On 08/14/2014 02:13 PM, Markus Hitter wrote: >> Issue 2: I need this simple patch ... >> >> --- compat/apple-common-crypto.h.org2014-07-30 23:19:53.0 >> +0200 >> +++ compat/apple-common-crypto.h

Git on Mac OS X 10.4.10

ror 1 -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html