| commit | d0bfda1a1a21cb1f4ef661051199f98fd4869752 | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Wed, 24 May 2006 21:03:40 +0000 (24 22:03 +0100) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Wed, 24 May 2006 21:03:40 +0000 (24 22:03 +0100) | ||
| tree | add80f6c71a49c2ed9056f684ba4790c5650492c | treesnapshot (tar.gz zip) |
| parent | 93a4d1ae150eeb634b45ad4a688088de8cb1956e | commitdiff |
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>
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 | diffblobblamehistory | |
| stgit/git.py | diffblobblamehistory |