~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fab69ea) | patch
Leave working dir and index alone after failed (conflicting) push
authorDavid Kågedal <david@virtutech.com>
Wed, 19 Dec 2007 18:00:11 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:30 +0000 (23:13 +0000)
commitf02be96172f8cf36e052ff86678646b1991ed283
tree5d1cab62175e8e1068baa38ea19f4d7cc7e92d86tree | snapshot (tar.gz zip)
parentfab69eacedd180b5c67812336bfdb5f52f6a4ae5commit | diff
Leave working dir and index alone after failed (conflicting) push

This leaves the index and working tree in the state that merge-recursive
left it, with unmerged files in different stages, and the non-conflicting
changes in the index.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/git.py diff | blob | blame | history
stgit/stack.py diff | blob | blame | history
t/t0002-status.sh diff | blob | blame | history
t/t1205-push-subdir.sh diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)