From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
To: git@vger.kernel.org
Subject: StGIT and rerere
Date: Sat, 21 Oct 2006 00:39:09 +0200 [thread overview]
Message-ID: <200610210039.10215.robin.rosenberg.lists@dewire.com> (raw)
Hi,
It seems stgit does not use git-rerere, so why not? Any reason other than it
hasn't been done yet?
I abuse stgit heavily, by frequently reording patches, which for some patches
result in re-occuring conflicts. git-rerere seems to be the solution.
What's the "rules" for when to invoke rerere? It seems it is mostly automatic
in git, but since only the porcelainish commands use it, that means StGIT
doesn't.
So here is what I *think* needs to be done. Seems simple enough.
stg push, stg pick, stg import, stg goto, stg fold, stg float
do what push does and invoke git-rerere at the end whether the push ends with
conflicts or not
stg pop
nothing, or do I need to remove rr-cache/MERGE_RR, like git-reset does?
stg status --reset, stg push --undo
remove rr-cache/MERGE_RR ?
stg refresh
do what stgit does normally and then invoke git-rerere
stg resolved:
do what stgit does normally and then invoke git-rerere
stg clean, stge delete:
remove rr-cache/MERGE_RR ?
Anything else or comments on this list?
-- robin
next reply other threads:[~2006-10-20 22:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-20 22:39 Robin Rosenberg [this message]
2006-10-26 16:34 ` StGIT and rerere Catalin Marinas
2006-10-26 17:21 ` Junio C Hamano
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=200610210039.10215.robin.rosenberg.lists@dewire.com \
--to=robin.rosenberg.lists@dewire.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).