From: Catalin Marinas <catalin.marinas@arm.com>
To: git@vger.kernel.org, "Karl Hasselström" <kha@treskal.com>
Subject: [StGit PATCH 0/4] Reposting udpated patches
Date: Tue, 17 Mar 2009 11:08:47 +0000 [thread overview]
Message-ID: <20090317110721.27748.10295.stgit@pc1117.cambridge.arm.com> (raw)
There are three patches which were updated after discussions and the
recommendation for the hidden argument to reorder_patches(). I haven't
reposted the acked patches.
Catalin Marinas (4):
Use a default "hidden" argument in StackTransaction.reorder_patches
Convert "float" to the lib infrastructure
Add automatic git-mergetool invocation to the new infrastructure
Add mergetool support to the classic StGit infrastructure
examples/gitconfig | 21 +-----
stgit/commands/edit.py | 2 -
stgit/commands/float.py | 80 +++++++++--------------
stgit/commands/goto.py | 2 -
stgit/commands/resolved.py | 5 -
stgit/commands/sink.py | 84 +++++++++++--------------
stgit/config.py | 1
stgit/git.py | 31 +++++----
stgit/gitmergeonefile.py | 150 --------------------------------------------
stgit/lib/git.py | 19 +++++-
stgit/lib/transaction.py | 11 ++-
t/t0002-status.sh | 3 -
t/t1501-sink.sh | 2 -
13 files changed, 114 insertions(+), 297 deletions(-)
delete mode 100644 stgit/gitmergeonefile.py
--
Catalin
next reply other threads:[~2009-03-17 11:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-17 11:08 Catalin Marinas [this message]
2009-03-17 11:08 ` [StGit PATCH 1/4] Add mergetool support to the classic StGit infrastructure Catalin Marinas
2009-03-17 15:29 ` Karl Hasselström
2009-03-17 11:08 ` [StGit PATCH 2/4] Add automatic git-mergetool invocation to the new infrastructure Catalin Marinas
2009-03-17 15:30 ` Karl Hasselström
2009-03-17 11:09 ` [StGit PATCH 3/4] Convert "float" to the lib infrastructure Catalin Marinas
2009-03-17 16:34 ` Karl Hasselström
2009-03-17 11:09 ` [StGit PATCH 4/4] Use a default "hidden" argument in StackTransaction.reorder_patches Catalin Marinas
2009-03-17 16:38 ` Karl Hasselström
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=20090317110721.27748.10295.stgit@pc1117.cambridge.arm.com \
--to=catalin.marinas@arm.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox