diff options
| -rwxr-xr-x | git-debrebase | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index f6d379a..d174fe6 100755 --- a/git-debrebase +++ b/git-debrebase @@ -427,6 +427,23 @@ sub classify ($) { # way also there's also an easy rune to look for the upstream # patches (--topo-order). + # Also this makes --first-parent be slightly more likely to + # be useful - it makes it provide a linearised breakwater history. + + # Of course one can say somthing like + # gitk -- ':/' ':!/debian' + # to get _just_ the commits touching upstream files, and by + # the TREESAME logic in git-rev-list this will leave the + # breakwater into upstream at the first anchor. But that + # doesn't report debian/ changes at all. + + # Other observations about gitk: by default, gitk seems to + # produce output in a different order to git-rev-list. I + # can't seem to find this documented anywhere. gitk + # --date-order DTRT. But, gitk always seems to put the + # parents from left to right, in order, so it's easy to see + # which way round a pseudomerge is. + $p[0]{IsOrigin} and $badanchor->("is an origin commit"); $p[1]{Differs} & ~DS_DEB and $badanchor->("upstream files differ from left parent"); |