This is the complete conflict series from David, with a bunch of new
cleanups by me added on top.
The bulk of these cleanups are the removal of
stg status --reset
stg rm
stg add
stg cp
I think they should go, since there are already commands in git that
do the same thing. And realistically, every StGit user is also a git
user, so removing these commands means there's less to learn.
The next step would be to get rid of "stg resolved" too, since git-add
already does that job (interactive merging is handled by
git-mergetool).
Catalin, is this a direction you can see StGit taking, or would you
rather head the other way and attempt to hide git entirely?
--
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
