diff options
| author | Jonathon Mah <me@JonathonMah.com> | 2011-04-13 03:00:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-13 12:21:45 -0700 |
| commit | ff7f089ed1064b6a10e958bf405f828226262424 (patch) | |
| tree | b3bade0c5549198e3d1f1ac9f14312527e1ed3a7 /merge-file.c | |
| parent | c3f6163b0b6e2cfae1422050c9607db1130cded0 (diff) | |
| download | git-ff7f089ed1064b6a10e958bf405f828226262424.tar.gz | |
mergetool: Teach about submodules
When the index has conflicted submodules, mergetool used to mildly
clobber the module, renaming it to mymodule.BACKUP.nnnn, then failing to
copy it non-recursively.
Recognize submodules and offer a resolution instead:
Submodule merge conflict for 'Shared':
{local}: submodule commit ad9f12e3e6205381bf2163a793d1e596a9e211d0
{remote}: submodule commit f5893fb70ec5646efcd9aa643c5136753ac89253
Use (l)ocal or (r)emote, or (a)bort?
Selecting a commit will stage it, but not update the submodule (as git
does had there been no conflict). Type changes are also supported,
should the path be a submodule on one side, and a file, symlink,
directory, or deleted on the other.
Signed-off-by: Jonathon Mah <me@JonathonMah.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions