| commit | 4fe0a8e009776b8c66357f08ef8171bdc2c0f468 | |
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | |
| Wed, 25 Feb 2009 19:44:11 +0000 (25 20:44 +0100) | ||
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | |
| Wed, 25 Feb 2009 19:49:28 +0000 (25 20:49 +0100) | ||
| tree | 058b28a9432021d9bdef5717d905d82a0c2d614f | treesnapshot (tar.gz zip) |
| parent | 991921b9e0009b6127e0c3d996c682bee555b99b | commitdiff |
[TOPGIT] allow working with annihilated branches
If you decide that you want to drop a patch, you can just merge in its
base with strategy "theirs". Then you have base=topic and so no .top*
files any more. This patch fixes tg summary and the helper function
recurse_deps() to handle these annihilated branches as if they don't
exist and don't show up in .topdeps files.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
If you decide that you want to drop a patch, you can just merge in its
base with strategy "theirs". Then you have base=topic and so no .top*
files any more. This patch fixes tg summary and the helper function
recurse_deps() to handle these annihilated branches as if they don't
exist and don't show up in .topdeps files.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| tg-summary.sh | diffblobblamehistory | |
| tg.sh | diffblobblamehistory |