~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f0699cc) | patch
Add a merged upstream test for pull and push
authorCatalin Marinas <catalin.marinas@gmail.com>
Fri, 3 Mar 2006 22:13:11 +0000 (22:13 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 3 Mar 2006 22:13:52 +0000 (22:13 +0000)
commit1777d8cd458bddb1a5f638e8928726167469154c
tree52de2ea91e39dffe4cf03f8bef47ea0c8578d154tree | snapshot (tar.gz zip)
parentf0699cc74b73be50a6a99aa3459fb74383c094c3commit | diff
Add a merged upstream test for pull and push

This patch adds the --merged option to both pull and push commands. With
this option, these commands will first try to check which patches were
merged upstream by reverse-applying them in reverse order. This should
solve the situation where several patches modify the same line in a file.

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