~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 93a4d1a) | patch
Add the --update option to pick
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 24 May 2006 21:03:40 +0000 (22:03 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 24 May 2006 21:03:40 +0000 (22:03 +0100)
commitd0bfda1a1a21cb1f4ef661051199f98fd4869752
treeadd80f6c71a49c2ed9056f684ba4790c5650492ctree | snapshot (tar.gz zip)
parent93a4d1ae150eeb634b45ad4a688088de8cb1956ecommit | diff
Add the --update option to pick

This option updates the current patch with changes from the picked commit
or patch. This option is useful when work is done on a temporary patch but
the changes need to be folded back into existing patches. Note that
three-way merging is not supported with this option (I'm not sure it is
even needed).

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/pick.py diff | blob | blame | history
stgit/git.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)