I've rebased my branches on top of Catalin's latest master and stable.
They include all the patches I've sent to the list recently.
I've added a "stable" branch, for patches intended for Catalin's
"stable".
In the experimental branch, I've updated the reset command a bit -- it
should now be quite usable. Bug reports and feature requests and
general comments welcome. (Note to those who already run my
experimental branch: I've changed the stack log format, so you'll have
to nuke your <branchname>.stgit branches. StGit will remind you if you
forget.)
-+-
The following changes since commit bd3f01319a03fc883d391f24639176f0f65727e5:
Catalin Marinas (1):
Release 0.14.2
are available in the git repository at:
git://repo.or.cz/stgit/kha.git stable
Karl Hasselström (1):
Fix problems in t1000-branch-create
t/t1000-branch-create.sh | 56 +++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 20 deletions(-)
-+-
The following changes since commit 719309aa54c8fa43bd8700f09b1e293923ed4e0a:
Catalin Marinas (1):
Merge branch 'stable'
are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
Karl Hasselström (5):
Fix problems in t1000-branch-create
Merge branch 'stable' into stable-master-merge
Don't both change directory and set GIT_WORK_TREE
Log environment and cwd as well as the actual command
emacs mode: handle "stg status" output with #
contrib/stgit.el | 2 +-
stgit/lib/git.py | 14 +++++++----
stgit/run.py | 6 +++++
t/t1000-branch-create.sh | 56 +++++++++++++++++++++++++++++----------------
4 files changed, 52 insertions(+), 26 deletions(-)
-+-
The following changes since commit 999dcbc241e377f8b39f0064dd8cc1670e667f18:
Karl Hasselström (1):
emacs mode: handle "stg status" output with #
are available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
Karl Hasselström (12):
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
Add property with a list of all patch names
Library functions for tree and blob manipulation
Write to a stack log when stack is modified
Add utility function for reordering patches
New command: stg reset
contrib/stgit.el | 33 +++++++---
stgit/commands/branch.py | 18 ++++--
stgit/commands/clone.py | 3 +-
stgit/commands/coalesce.py | 3 +-
stgit/commands/commit.py | 6 +-
stgit/commands/common.py | 33 +++-------
stgit/commands/delete.py | 70 ++++++---------------
stgit/commands/edit.py | 26 +-------
stgit/commands/float.py | 3 +
stgit/commands/fold.py | 3 +-
stgit/commands/imprt.py | 3 +-
stgit/commands/init.py | 3 +-
stgit/commands/new.py | 97 ++++++++++++++++-------------
stgit/commands/pick.py | 4 +-
stgit/commands/pop.py | 3 +-
stgit/commands/pull.py | 3 +-
stgit/commands/push.py | 6 +-
stgit/commands/rebase.py | 4 +-
stgit/commands/refresh.py | 4 +-
stgit/commands/rename.py | 4 +-
stgit/commands/reset.py | 67 ++++++++++++++++++++
stgit/commands/resolved.py | 4 +-
stgit/commands/sink.py | 3 +-
stgit/commands/sync.py | 5 +-
stgit/commands/uncommit.py | 2 +-
stgit/lib/git.py | 147 ++++++++++++++++++++++++++++++++++++--------
stgit/lib/log.py | 130 ++++++++++++++++++++++++++++++++++++++
stgit/lib/stack.py | 1 +
stgit/lib/transaction.py | 17 +++++-
stgit/main.py | 2 +
stgit/utils.py | 50 +++++++++++++++
t/t1400-patch-history.sh | 2 -
t/t1600-delete-one.sh | 8 +-
33 files changed, 559 insertions(+), 208 deletions(-)
create mode 100644 stgit/commands/reset.py
create mode 100644 stgit/lib/log.py
--
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
