chiark - git - mdw - stgit/commit

author	Karl Hasselström <kha@treskal.com>
	Sun, 21 Sep 2008 12:17:41 +0000 (14:17 +0200)
committer	Karl Hasselström <kha@treskal.com>
	Sun, 21 Sep 2008 12:19:07 +0000 (14:19 +0200)
commit	9690617a55cba571d0cb25ed846ef41942063020
tree	229c12191d8d801a9360183f9a73e600adf9357d	tree \| snapshot
parent	d6a698bbff11af2312600afb708d23d69e75d8e3	commit \| diff

Add a --hard flag to stg reset

With this flag, reset will overwrite any local changes. Useful e.g.
when undoing a push that has polluted the index+worktree with a heap
of conflicts.

Signed-off-by: Karl Hasselström <kha@treskal.com>

stgit/commands/reset.py		diff \| blob \| blame \| history
stgit/lib/git.py		diff \| blob \| blame \| history
stgit/lib/transaction.py		diff \| blob \| blame \| history
t/t3101-reset-hard.sh	[new file with mode: 0755]	blob

GIT patch-maintenance porcelain (local modifications)

RSS Atom