chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1d5cfe6) | patch
Fix the rebasing with an external command
authorCatalin Marinas <catalin.marinas@gmail.com>
Fri, 28 Sep 2007 21:51:15 +0000 (22:51 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 28 Sep 2007 21:51:15 +0000 (22:51 +0100)
commit64e15469e9ddf6e038b967beeae75c79d1a29460
treeed54b1260f2815946ebcad9f9237005d284aa2b8tree | snapshot
parent1d5cfe617d97d943b41f4be17c4f5955a7026297commit | diff
Fix the rebasing with an external command

Since git.py caches the HEAD value, rebasing with and external command
didn't clear the cache and the subsequent push simple fast-forwards
the tree. The patch creates a new git.rebase() function which takes
care of custom rebase commands. It also removes "must_rebase" in
pull.py as it doesn't seem to be used.

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/git.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)