From: Catalin Marinas <catalin.marinas@gmail.com>
To: Peter Osterlund <petero2@telia.com>
Cc: GIT <git@vger.kernel.org>
Subject: Re: Stacked GIT 0.3 (now more Quilt-like)
Date: Thu, 07 Jul 2005 22:22:22 +0100 [thread overview]
Message-ID: <1120771342.7032.5.camel@localhost.localdomain> (raw)
In-Reply-To: <m38y0ictno.fsf@telia.com>
On Thu, 2005-07-07 at 21:17 +0200, Peter Osterlund wrote:
> I've found an unrelated problem. If I export patches with "stg export
> dirname", there are no diffs included in the patches. The patch
> description is all that is generated. If I omit the dirname parameter,
> the export works correctly though.
OK, thanks. Fixed in the today's snapshot. I also added a 'resolved'
command to mark a solved conflict. 'stg status' also shows the conflicts
and 'refresh', 'push', 'pop' fail if there are unresolved conflicts. You
can override this by setting 'autoresolved: yes' in the stgitrc file and
a 'refresh' command marks all the conflicts as solved automatically (I
still need to find some time to write a tutorial for StGIT).
Catalin
next prev parent reply other threads:[~2005-07-07 21:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-28 21:26 Stacked GIT 0.3 (now more Quilt-like) Catalin Marinas
2005-07-03 8:38 ` Peter Osterlund
2005-07-03 10:08 ` Catalin Marinas
2005-07-03 12:38 ` Peter Osterlund
2005-07-03 21:14 ` Catalin Marinas
2005-07-04 1:10 ` Horst von Brand
2005-07-04 6:27 ` Martin Langhoff
2005-07-04 12:32 ` Peter Osterlund
2005-07-04 17:09 ` randy_dunlap
2005-07-04 20:42 ` Catalin Marinas
2005-07-06 20:54 ` Catalin Marinas
2005-07-07 19:17 ` Peter Osterlund
2005-07-07 21:22 ` Catalin Marinas [this message]
2005-07-08 1:10 ` Peter Osterlund
2005-07-08 1:24 ` Junio C Hamano
2005-07-08 8:14 ` Peter Osterlund
2005-07-08 9:32 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1120771342.7032.5.camel@localhost.localdomain \
--to=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=petero2@telia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.