making stgit handle being rebased by git rebase

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Catalin, Karl,

Has anyone looked at making stgit interact with git-rebase more gracefully?

I've been playing with some of the recent git submodule improvements,
in particular the submodule.<mod>.update=rebase option. When I have a
submodule which I've been using stgit on it gets a bit upset when the
branch gets rebased by git. I don't loose any work but all my stgit
patches get turned into git commits. I can get them back with stg
repair and/or stg uncommit but I was wondering if there was any way of
making stgit play nicely with git rebase.

As a workaround I could have something remember the applied patches,
run stg pop -a and re-apply the patches after the fact. All of which
is doable but maybe there is a better way.

Thanks,
Chris
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]