chiark / gitweb /
Add "stg coalesce"
authorKarl Hasselström <kha@treskal.com>
Wed, 19 Dec 2007 18:00:14 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:31 +0000 (23:13 +0000)
commit48b209cd91bc84c1f1a95080ba9c2c575eda0640
tree26d90285504810c5783ec9edf20c0d71c65aed4d
parentfe1cee2e49d9995852ba92d8fba1d064acf2fca9
Add "stg coalesce"

It coalesces two or more consecutive applied patches, with no need to
touch index/worktree, and no possibiliy of conflicts.

Future improvements could relax the "consecutive" and "applied"
restrictions, by building a new chain of commits just like "stg push"
will do once it's been converted to the new infrastructure.

Signed-off-by: Karl Hasselström <kha@treskal.com>
contrib/stgit-completion.bash
stgit/commands/coalesce.py [new file with mode: 0644]
stgit/main.py
stgit/utils.py
t/t2600-coalesce.sh [new file with mode: 0755]