From: Marco Costalba <[EMAIL PROTECTED]>
Date: 1125080490 +0200
This files are created by 'make' so remove from
repository
Signed-off-by: Marco Costalba <[EMAIL PROTECTED]>
---
This time I send the patch ;-)
templates/blt/description |1 -
templates/bl
Hi,
$ git status
nothing to commit
$ make clean
rm -f *.o mozilla-sha1/*.o ppc/*.o git-update-cache git-diff-files git-init-db
git-write-tree
git-read-tree git-commit-tree git-cat-file git-fsck-cache git-checkout-cache
git-diff-tree
git-rev-tree git-ls-files git-ls-tree git-merge-base git-merge
Hi all,
On SF there is an update of qgit, a git GUI viewer (and lately also
committer and patch exchanger ;-) )
http://prdownloads.sourceforge.net/qgit/qgit-0.93.tar.bz2?download
This time I have added the interfaces to import and export patches by
git-format-patch-script and git-appl
From: Marco Costalba <[EMAIL PROTECTED]>
Date: 1124553736 +0200
When git-commit-script is called with -v option and
verify test fails result is print on stdout
instead of stderr.
Signed-off-by: Marco Costalba <[EMAIL PROTECTED]>
---
git-commit-script | 10 +-
1 file
In case of empty messages git-mailinfo ignores the "---"
line adding dirty stuff in commit message otherwise empty
Signed-off-by: Marco Costalba <[EMAIL PROTECTED]>
---
tools/mailinfo.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
1ebfddf05e46558111570280
Catalin Marinas wrote:
>>
>>If I uderstand correctly you never commit patches from StGIT stack directly
>>in your base git repository, in this example git HEAD, but you always round
>>trip to MAIN.
>
When I say 'you always round trip to MAIN', I mean you send patches
upstream and someone commits
Catalin Marinas wrote:
>
>The base of the StGIT stack in the HEAD repository (branch) should
>always be the head of the MAIN repository.
That's the point I missed, now it's more clear.
>
>That's how you would normally do development on Linux using StGIT -
>clone the mainline kernel, create patc
Marco Costalba wrote:
>>
>>This way I found StGIT useful for maintainers as well, not only for
>>contributors.
>>
>
>Sorry if the answer is silly, but I still don't know well StGIT .
>
'question' not 'answer'
I don't now if th
Johannes Schindelin wrote:
>Hi,
>
>On Wed, 17 Aug 2005, Marco Costalba wrote:
>
>>P.S: I say 'revision', and 'git archive' but are very common also
>>'commit' and 'git repository'. This is just a silly example where a
>>co
Catalin Marinas wrote:
>
>Once you want a subset of these patches merged into MAIN, just pop
>everything from the stack and only push those you want merged, in the
>order you want (if there are some dependencies, the push will fail and
>you can correct them or the order). When you are happy with t
Hi,
the round trip
1) git-format-patch --mbox --keep-subject
2) git-applymbox -k
is not perfect for revisions where there is only the subject.
An example is c35a7b8d806317dc1762e36561cbd31c2530dd9c in git archive
Original text is:
Skip merges in format-patch.
After round trip:
Ski
Avoid that git-format-patch writes out patch series
information on stderr when there are no errors
Signed-off-by: Marco Costalba <[EMAIL PROTECTED]>
---
git-format-patch-script |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
47238497f48d19a0bf44eb9b23875bbb8e8a12aa
diff --git
Junio C Hamano wrote:
>Introduces --keep-subjects flag to tell it not to munge the
>first line of the commit message. Running "git applymbox" on
>the output from "git format-patch -m -k" would preserve the
>original commit information better this way.
>
>Opinions? Objections?
>
This is exaclt
Daniel Barkalow wrote:
>>2) Practical: The round trip git-format-patch + git-applymbox is the logical
>>and
>>natural way to reach this goal or, also in this case, I intend to stretch
>>some tools,
>>designed for one thing, for something else?
>
>
>I'd guess that git-diff-tree + git-apply (witho
Martin Langhoff wrote:
>>From what I understand, you'll want the StGIT infrastructure. If you
>use git/cogito, there is an underlying assumption that you'll want
>all the patches merged across, and a simple cg-update will bring in
>all the pending stuff.
>
My concerns are both metodologicals and
Junio C Hamano wrote:
>
>I would like to know a bit about "git format-patch" adding extra
>info that you needed to get rid of. It shouldn't be necessary.
>
As example, in the rev d5a63b99835017d2638e55a7e34a35a3c1e80f1f from git
the original subject is:
' Alternate object pool mechanism updat
Hi,
I would like to ask the list about something I'am thinking about,
and I'am not sure it's a good idea.
Suppose a possible scenario involves using a couple of git archives, one
for releases and stable code, say MAIN, and one for experimental stuff
or new development, say HEAD.
Suppose there
Martin Langhoff wrote:
>I figured out that it wanted qt3-mt, installed it, and fiddled with
>the SConfiguration file. Still no dice, perhaps because I have a qt4
>build environment?
I have qt 3 3.3.4 installed and I never dared to hope qgit can compile
with qt4, being a so huge compatibility br
Hi all,
qgit-0.9 has been released and can be downloaded from
http://prdownloads.sourceforge.net/qgit/qgit-0.9.tar.bz2?download
This version fixes a couple of nasty bugs, notably one in
annotate, crept in after recent changes. Anyone interested in
annotate function should upgrade.
B
Wolfgang Denk wrote:
>This is somewhat off topic here, so I apologize, but I didn't know
>any better place to ask:
>
>Has anybody any information if SourceForge is going to provide git /
>cogito / ... for the projects they host? I asked SF, and they openend
>a new Feature Request (item #125286
Junio C Hamano wrote:
>
>I am reluctant to actually do this right away, because this is
>an incompatible change from the current format:
>
>$ git format-patch his mine
>
Of course this breaks qgit interface to git-format-patch-script
but if you think it's better this way
>The same goes
Marco Costalba wrote:
>Linus Torvalds wrote:
>
>
>>- Any chance of having a git archive of qgit? I realize that sourceforge
>> doesn't have git archives, but (a) maybe you can ask and (b) maybe
>> there are alternate places you could put it. It's just
Linus Torvalds wrote:
>Ok, this is nicer than gitk, with the parents showing up in the commit
>message and thus easy to go to. You might add children too: it's not
>something git itself knows about intrisically, but since you've already
>built the graph, at least you see what children are part of
Hi all,
this is a fix release, mainly to accomodate the new 'A' flag instead of 'N'
in git-diff-tree format.
Some little new stuff too, complete changelog below:
- added move back/forward in selection history
- added "hyperlinks" SHA1's in commit messages
- fix cursor position in in commit
--- Marco Costalba <[EMAIL PROTECTED]> wrote:
> Date: Mon, 25 Jul 2005 14:34:56 -0700 (PDT)
> From: Marco Costalba <[EMAIL PROTECTED]>
> Subject: Re: [RFC] extending git-ls-files --exclude.
> To: Junio C Hamano <[EMAIL PROTECTED]>
> CC: Linus Torvalds <[EMAIL
Junio C Hamano wrote:
>The list of patterns that is in effect at a given time is
>built and ordered in the following way:
>
> * --exclude= and lines read from --exclude-from=
> come at the beginning of the list of patterns, in the order
> given on the command line. Patterns that come from th
Pattern in git-ls-files --exclude= can include directories
as example git-ls-files --exclude=Documentation/* will do what you expect
---
ls-files.c |4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
c8fdfc1f8280a753baf13c293db573c4e50f0a99
diff --git a/ls-files.c b/ls-files.c
--- a/ls
Hi,
here is qgit-0.8:
http://prdownloads.sourceforge.net/qgit/qgit-0.8.tar.bz2?download
This release shows a big GUI rewrite with added menus,
buttons, help, settings page, etc.
Some new features:
- Possibility to view diffs against current checked-out tree, i.e
GUI interface to git-
Ingo Molnar wrote:
>
>the bad news: except for annotations. I started qgit in the current
>kernel GIT repository, and clicked on the following commit:
>
> 5bbcfd9000887c0da7d57cc7b3ac869fc0dd5aa9
>
>then i clicked on sched.c to see the annotated file.
Interesting enough sched.c is one of the f
Wolfgang Denk ha scritto:
>Dear Marco,
>
>in message <[EMAIL PROTECTED]> you wrote:
>
>>Here is qgit-0.7, a GUI git viewer.
>
>
>Sorry, but I cannot compile it on a Fedora Core 4 system:
>
>-> ./configure
>+scons was found, that's excellent+
>scons: Reading SConscript files ...
>-> make
>scons -Q
Here is qgit-0.7, a GUI git viewer.
you can download from:
http://prdownloads.sourceforge.net/qgit/qgit-0.7.tar.gz?download
This time a small changelog, but a lot of work ;-)
- rewrite of graph drawing
- start-up loading: switch to use git-rev-list --topo-order
- final fixes to annotation
- ca
--- Junio C Hamano <[EMAIL PROTECTED]> wrote:
> > "DB" == Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> DB> [perl script]
>
> >> How does this work, and what do we do about merges?
>
Checking diffs of all the parents can be computational expensive.
I'am developing a different alghori
32 matches
Mail list logo
