On Fri, Feb 12, 2010 at 05:26:40PM -0600, Jonathan Nieder wrote: > Kurt Roeckx wrote: > > > > I think the main problem is that when I look at the history in git > > that it's unclear which patches are all applied to a branch. > > > > If you have a branch and you add a few patches to it, and then > > merge only the last one in an other branch, I think it looks > > just the same as if you've merged all the patches. > > > > I think it's just unclear what the parent is in each branch. > > Hmm, this leaves me a bit confused. :( > > Suppose (where time flows left to right), I have this history: > > E -- F -- G [topic] > / > A -- B -- C -- D [master] > > If I am on branch master and use 'git merge topic', then all the > changes from A to G get applied to master to form the merge commit. > > So it is not clear to me what it means to merge only the last patch on > a branch.
I'm not sure how this is done in git, but as far as I know, I've seen this done. It's basicly about backporting fixes from a master branch to one of the release/stable branches. Kurt -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
