Both branches updated. I've promoted some experimental patches to
safe, and done some work on new and delete (will post the patches in
reply to this mail).
-+-
The following changes since commit a639e7bbf3a6396254af76062ee88c22e4373340:
Karl Hasselström (1):
Don't clean away patches with conflicts
are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
Karl Hasselström (11):
Don't check out files if we don't have index+workdir
Make documentation less confusing
Reduce number of backslashes by using raw strings
Let "stg show" use the unified --diff-opts handling
Read default diff options from the user's config
Teach new infrastructure about the default author and committer
Teach new infrastructure to apply patches
Teach new infrastructure to diff two trees
Parse the date instead of treating it as an opaque string
Convert "stg edit" to the new infrastructure
Emacs mode: It's possible to edit unapplied patches now
Peter Oberndorfer (1):
Add an --index option to "stg refresh"
contrib/stgit.el | 4 +-
examples/gitconfig | 4 +
stgit/commands/common.py | 4 +-
stgit/commands/edit.py | 309 +++++++++++++++++++++------------------------
stgit/commands/mail.py | 4 +-
stgit/commands/new.py | 6 +-
stgit/commands/refresh.py | 25 +++-
stgit/commands/show.py | 13 +--
stgit/lib/git.py | 126 ++++++++++++++++++-
stgit/lib/transaction.py | 13 +-
stgit/utils.py | 3 +-
t/t2700-refresh.sh | 57 ++++++++-
12 files changed, 368 insertions(+), 200 deletions(-)
-+-
The following changes since commit 8ae7dc9d485fe5f3fee02ead7f25133be7321614:
Karl Hasselström (1):
Emacs mode: It's possible to edit unapplied patches now
are available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
Karl Hasselström (7):
Disable patchlog test for "stg new"
Convert "stg new" to the new infrastructure
Refactor --author/--committer options
Let "stg new" support more message options
Emacs mode: use "stg new --file"
Convert "stg delete" to the new infrastructure
Emacs mode: delete patches
contrib/stgit.el | 20 +++++----
stgit/commands/common.py | 33 +++++----------
stgit/commands/delete.py | 72 +++++++++++-----------------------
stgit/commands/edit.py | 25 +----------
stgit/commands/new.py | 97 +++++++++++++++++++++++++--------------------
stgit/lib/git.py | 8 ++--
stgit/utils.py | 50 +++++++++++++++++++++++
t/t1400-patch-history.sh | 2 -
t/t1600-delete-one.sh | 8 ++--
9 files changed, 160 insertions(+), 155 deletions(-)
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
