chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: adeef6b) | patch
Rename "stg coalesce" to "stg squash"
authorKarl Hasselström <kha@treskal.com>
Thu, 26 Feb 2009 20:13:37 +0000 (21:13 +0100)
committerKarl Hasselström <kha@treskal.com>
Thu, 26 Feb 2009 20:13:37 +0000 (21:13 +0100)
commit594aa463c1852f77b89bdce853da4e7052d7cdd2
tree41bfee37a697f10f066a0c2056c8f06fc86bdbd1tree | snapshot
parentadeef6bc6f43fbccb1a046e00f57c559ee363737commit | diff
Rename "stg coalesce" to "stg squash"

"squash" is the word git uses for this operation, so we should use it
too to lessen the confusion. Also, it's easier to spell.

We can do the rename without any effort at backwards compatibility
because "stg coalesce" has never been part of any released version.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Documentation/tutorial.txt diff | blob | blame | history
contrib/stgit.el diff | blob | blame | history
stgit/commands/refresh.py diff | blob | blame | history
stgit/commands/squash.py [moved from stgit/commands/coalesce.py with 81% similarity] diff | blob | blame | history
t/t2600-squash.sh [moved from t/t2600-coalesce.sh with 71% similarity] diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)