Messages in this thread | | | Subject | RE: merge status | Date | Wed, 9 Nov 2005 14:54:12 -0800 | From | "Luck, Tony" <> |
| |
> -rw-r--r-- 1 akpm akpm 78245 Nov 9 11:19 git-ia64.patch
Some of this size may be a git artifact (or to be strictly accurate an artifact of the way I maintain my git branches). I just merged up the latest linus branch into my test tree, and then ran:
$ git diff linus test
which only came up with 34799 bytes of diff. The extra bytes you see may be due to some commits that went into my test tree, but I goofed some of the comments ... so I ended up with the same patches going to my release tree, but as different commits. I assume that quilt then figures out that this stuff is already in Linus tree?
I think that I may need to periodically ditch and re-create my test branch ... it is full of "Auto-update from upstream" commits, plus all the commits to pull in topic branches. So when I've merged over all the topic branches to send to Linus the contents of the tree exactly match my release tree ... the history is very different (and somewhat messy in places).
-Tony - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |