commit | d7e3868cdfdc73c3de15296ecf32138a8308c07e | [log] [tgz] |
---|---|---|
author | Simon Hausmann <shausman@trolltech.com> | Tue Jun 12 14:34:46 2007 +0200 |
committer | Simon Hausmann <shausman@trolltech.com> | Tue Jun 12 14:34:46 2007 +0200 |
tree | fdb28b5425e517138e3ab16c3cda85109a1d582e | |
parent | 27d2d8119bf985a0b59152737316f04f871e03f7 [diff] |
Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally always rebasing on top of remotes/p4/master Signed-off-by: Simon Hausmann <shausman@trolltech.com>