On branch 8.2.x
Your branch and 'origin/8.1.x' have diverged,
and have 594 and 463 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	new file:   core/lib/Drupal/Core/Field/Plugin/migrate/cckfield/NodeReference.php
	new file:   core/lib/Drupal/Core/Field/Plugin/migrate/cckfield/ReferenceBase.php
	new file:   core/lib/Drupal/Core/Field/Plugin/migrate/cckfield/TaxonomyTermReference.php
	new file:   core/lib/Drupal/Core/Field/Plugin/migrate/cckfield/UserReference.php
	modified:   core/modules/field/migration_templates/d6_field.yml
	modified:   core/modules/field/migration_templates/d6_field_formatter_settings.yml
	modified:   core/modules/field/migration_templates/d6_field_instance.yml
	modified:   core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
	modified:   core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
	modified:   core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
	modified:   core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
	new file:   core/modules/field/src/Plugin/migrate/process/d6/FieldWidgetType.php
	modified:   core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
	modified:   core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
	modified:   core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
	modified:   core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
	copied:     core/modules/field/src/Plugin/migrate/process/d6/FieldInstanceSettings.php -> core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
	modified:   core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
	modified:   core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
	new file:   core/modules/migrate/migrate.api.php.rej
	modified:   core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
	modified:   core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
	modified:   core/modules/migrate_drupal/tests/fixtures/drupal6.php
	modified:   core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
	modified:   core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
	deleted:    core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
	modified:   core/modules/text/src/Plugin/migrate/cckfield/TextField.php

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	2447727-112.patch
	2447727-124.patch
	2447727-135.patch
	2447727-162.patch
	2666392-2.patch
	drupal_2494073_239.patch
	export/
	foo.php
	foo.sh
	foo/
	graph.pdf
	interdiff-123.txt
	modules/composer_deploy/
	modules/composer_manager/
	modules/config_devel/
	modules/config_graph/
	modules/config_override/
	modules/config_sync/
	modules/config_tools/
	modules/config_update/
	modules/ctools/
	modules/devel/
	modules/ds/
	modules/entity_browser/
	modules/facets/
	modules/field_group/
	modules/graphql/
	modules/inline_entity_form/
	modules/layout_plugin/
	modules/mannheim_migrate/
	modules/markup/
	modules/migrate_upgrade/
	modules/name/
	modules/og/
	modules/pathauto/
	modules/relation/
	modules/search_api/
	modules/search_api_solr/
	modules/swiftmailer/
	modules/token/
	modules/widget_on_demand/
	output/
	phpinfo.php
	sites/default/files/
	sites/default/settings.php
	sites/simpletest/
	vendor/