chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b70e43e) | patch
Specify a different base for the imported patch
authorCatalin Marinas <catalin.marinas@gmail.com>
Sun, 18 Sep 2005 08:02:37 +0000 (09:02 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Sun, 18 Sep 2005 08:02:37 +0000 (09:02 +0100)
commit35344f865c199e8457d951bc51b45d21f813cbc2
tree49a7d8c66062ba1dc8436eb342575f786d37979dtree | snapshot
parentb70e43eb58252ac85081a146ec2ee43861d7af60commit | diff
Specify a different base for the imported patch

This option will import a patch on a different base and perform a three-way
merge with the current HEAD.

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