| 1 |
On Sat, Apr 29, 2006 at 03:54:17PM +0300, Dan Armak wrote: |
| 2 |
> On Saturday 29 April 2006 15:21, Fernando J. Pereda wrote: |
| 3 |
> > The commit marked with @ is a special comit called a 'merge'. |
| 4 |
> > I hope that clarifies the merge tracking part. |
| 5 |
> You just described what merging is. Svn can do that too with svn merge. But, |
| 6 |
> if I merge changesets from branch A to B selectively, skipping some along the |
| 7 |
> way, can I later ask git to: |
| 8 |
> |
| 9 |
> - list the changesets remaining in A that I haven't merged to B yet? |
| 10 |
|
| 11 |
Yes, unless you used cherry-pick. You have to do *real* merges to be |
| 12 |
able to do that. |
| 13 |
|
| 14 |
> - list the branches, from a given list, which have/haven't merged a given |
| 15 |
> changeset? |
| 16 |
|
| 17 |
It depends on how you merged the changesets, if you did it sanely, yes, |
| 18 |
should be easy. If you used cherry-pick here and there I don't think so. |
| 19 |
|
| 20 |
> I didn't mean that 'changeset tracking' is different from 'merge tracking'. |
| 21 |
|
| 22 |
Ok. |
| 23 |
|
| 24 |
- ferdy |
| 25 |
|
| 26 |
-- |
| 27 |
Fernando J. Pereda GarcimartÃn |
| 28 |
Gentoo Developer (Alpha,net-mail,mutt,git) |
| 29 |
20BB BDC3 761A 4781 E6ED ED0B 0A48 5B0C 60BD 28D4 |
Archives