![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 12 Jan 2007 03:21:38 +0000 (22:21 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 14 Jan 2007 07:15:12 +0000 (02:15 -0500) | ||
| commit | 62b6f48388faf0ac2432a07cfc53aa904c591f8f | |
| tree | 2dfad5f3e00bb1d67a33556104f93f60451aafa9 | tree | snapshot |
| parent | cacbdd0afb481a6f3019e5e7db98f88e40941fd5 | commit | diff |
Support creation of merge commits in fast-import.
Some importers are able to determine when branch merges occurred
within their source data. In these cases they will want to supply
the correct commits to fast-import so that a proper merge commit
will exist in Git. This is now supported by supplying a 'merge '
command after the commit message and optional from command.
A merge is not actually performed by fast-import, its assumed that
the frontend performed any sort of merging activity already and
that fast-import should simply be storing its result.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Some importers are able to determine when branch merges occurred
within their source data. In these cases they will want to supply
the correct commits to fast-import so that a proper merge commit
will exist in Git. This is now supported by supplying a 'merge '
command after the commit message and optional from command.
A merge is not actually performed by fast-import, its assumed that
the frontend performed any sort of merging activity already and
that fast-import should simply be storing its result.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| fast-import.c | diff | blob | history |