[StGit PATCH 0/4] Reposting udpated patches

From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mar 17, 2009, 11:08 UTC
Message-ID: <20090317110721.27748.10295.stgit@pc1117.cambridge.arm.com>

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