I'll follow up with the three patch series in here that are new.
The following changes since commit cd885e085a697d5377956d5beb30e6030f224ccd:
Peter Oberndorfer (1):
replace "git repo-config" usage by "git config"
are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
Karl Hasselström (10):
Don't keep old committer when rewriting a commit
Homogenize buffer names
Remove unused default values
Refactor --diff-opts handling
Create index and worktree objects just once
Wrap excessively long line
Eliminate temp variable that's used just once
Simplify editor selection logic
Let the caller supply the diff text to diffstat()
Don't clean away patches with conflicts
Pavel Roskin (1):
Add test to ensure that "stg clean" preserves conflicting patches
contrib/stgit.el | 6 +++---
stgit/commands/clean.py | 7 +++++++
stgit/commands/coalesce.py | 2 +-
stgit/commands/commit.py | 2 +-
stgit/commands/common.py | 3 ++-
stgit/commands/diff.py | 19 ++++++-------------
stgit/commands/edit.py | 16 ++++------------
stgit/commands/export.py | 20 +++++++-------------
stgit/commands/files.py | 15 +++++----------
stgit/commands/goto.py | 2 +-
stgit/commands/mail.py | 26 +++++++++-----------------
stgit/commands/status.py | 17 +++++------------
stgit/git.py | 9 +++------
stgit/lib/git.py | 42 ++++++++++++++++++++++++++++++++----------
stgit/lib/transaction.py | 4 ++--
stgit/utils.py | 20 ++++++++++++++------
t/t2500-clean.sh | 17 +++++++++++++++++
17 files changed, 119 insertions(+), 108 deletions(-)
-+-
The following changes since commit 149ad73c6b1639981b1064a9e8f3699b08928621:
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 experimental
Karl Hasselström (6):
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
Convert "stg edit" to the new infrastructure
Peter Oberndorfer (1):
Add an --index option to "stg refresh"
examples/gitconfig | 4 +
stgit/commands/edit.py | 309 +++++++++++++++++++++------------------------
stgit/commands/refresh.py | 25 +++-
stgit/commands/show.py | 13 +--
stgit/lib/git.py | 54 ++++++++
stgit/utils.py | 3 +-
t/t2700-refresh.sh | 57 ++++++++-
7 files changed, 283 insertions(+), 182 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
