git-annex/doc
Joey Hess 1503b86a14
make import tree from remote generate a merge commit
This way no history is lost, neither what was exported to the remote,
or the history of changes that is imported from it. No complicated
correlation of two possibly very different histories is needed, just
record what we know and then git merge will do a good job.

Also, it notices when the remote tracking branch doesn't need to be updated,
and avoids doing anything, so noop remotes are super cheap.

The only catch here is that, since the commits generated for imports
from the remote don't have a stable date or author/committer, each
(non-noop) import generates different commits for the same imported
trees. So, when the imported remote tracking branch is merged into master
and then a change is imported again, there will be an extra series of
commits, which will get more and more expensive each time.

This seems to call for making stable commits for imports. Also that
seems a good idea to make importing in several repositories have the
same result.
2019-04-30 16:13:21 -04:00
..
Android
android
assistant
automatic_conflict_resolution
backends
bare_repositories
bugs close 2019-04-23 12:42:13 -04:00
coding_style
contribute
copies
design thoughts 2019-04-09 15:50:52 -04:00
devblog devblog 2019-04-23 16:36:50 -04:00
direct_mode
download
encryption
footer
forum Added a comment: A useful command in combination with this 2019-04-24 12:37:36 +00:00
future_proofing
git-annex-add
git-annex-addurl Added a comment: Re: Inconsistent idiom 2019-03-28 03:59:04 +00:00
git-annex-adjust
git-annex-checkpresentkey
git-annex-config
git-annex-copy
git-annex-direct
git-annex-drop
git-annex-enableremote
git-annex-find Added a comment: Find (and other operations) over multiple repos 2019-02-25 14:33:27 +00:00
git-annex-importfeed
git-annex-lookupkey comment 2019-04-03 13:01:07 -04:00
git-annex-metadata
git-annex-move
git-annex-preferred-content
git-annex-reinject
git-annex-rmurl
git-annex-setpresentkey
git-annex-sync
git-annex-test
git-annex-unannex
git-annex-undo
git-annex-uninit
git-annex-unlock
git-annex-unused
git-annex-whereis
how_it_works
install Added a comment: Warning building with cabal 2019-03-30 00:19:11 +00:00
internals be more explicit about new hash format 2019-04-01 19:52:00 +00:00
license
links
metadata
news add news item for git-annex 7.20190322 2019-03-22 13:57:24 -04:00
not
polls
preferred_content
profiling
required_content
scalability
security
special_remotes document importree for S3 2019-04-23 13:19:08 -04:00
stickers
sync
templates
testimonials
thanks update 2019-04-05 10:35:06 -04:00
tips Merge branch 'master' into import-from-s3 2019-04-23 15:34:26 -04:00
todo make import tree from remote generate a merge commit 2019-04-30 16:13:21 -04:00
trust
tuning
upgrades
use_case
users add kyle 2019-02-08 17:22:43 +00:00
videos
walkthrough this is not all run as root 2019-03-27 11:15:03 -04:00
Android.mdwn adb import 2019-04-09 17:52:41 -04:00
assistant.mdwn
automatic_conflict_resolution.mdwn
backends.mdwn
bare_repositories.mdwn
bugs.mdwn
builds.mdwn
chunking.mdwn
coding_style.mdwn
comments.mdwn
contact.mdwn
contribute.mdwn
copies.mdwn
design.mdwn
devblog.mdwn
direct_mode.mdwn
distributed_version_control.mdwn
download.mdwn
encryption.mdwn
favicon.ico
forum.mdwn
future_proofing.mdwn
git-annex-add.mdwn
git-annex-addunused.mdwn
git-annex-addurl.mdwn
git-annex-adjust.mdwn
git-annex-assistant.mdwn
git-annex-benchmark.mdwn
git-annex-calckey.mdwn
git-annex-checkpresentkey.mdwn
git-annex-config.mdwn
git-annex-contentlocation.mdwn
git-annex-copy.mdwn
git-annex-dead.mdwn added renameremote command 2019-04-15 13:49:03 -04:00
git-annex-describe.mdwn
git-annex-diffdriver.mdwn
git-annex-direct.mdwn
git-annex-drop.mdwn
git-annex-dropkey.mdwn
git-annex-dropunused.mdwn
git-annex-edit.mdwn
git-annex-enable-tor.mdwn
git-annex-enableremote.mdwn
git-annex-examinekey.mdwn
git-annex-expire.mdwn
git-annex-export.mdwn document importree for S3 2019-04-23 13:19:08 -04:00
git-annex-find.mdwn
git-annex-findref.mdwn
git-annex-fix.mdwn
git-annex-forget.mdwn
git-annex-fromkey.mdwn fromkey --json 2019-02-05 14:03:29 -04:00
git-annex-fsck.mdwn
git-annex-fuzztest.mdwn
git-annex-get.mdwn
git-annex-group.mdwn
git-annex-groupwanted.mdwn
git-annex-import.mdwn doc updates for import 2019-03-09 13:10:30 -04:00
git-annex-importfeed.mdwn
git-annex-indirect.mdwn
git-annex-info.mdwn improve wording 2019-03-28 13:25:14 -04:00
git-annex-init.mdwn
git-annex-initremote.mdwn split out section on common configuration parameters 2019-04-16 13:09:12 -04:00
git-annex-inprogress.mdwn
git-annex-list.mdwn
git-annex-lock.mdwn
git-annex-log.mdwn
git-annex-lookupkey.mdwn
git-annex-map.mdwn
git-annex-matchexpression.mdwn
git-annex-matching-options.mdwn
git-annex-merge.mdwn
git-annex-metadata.mdwn
git-annex-migrate.mdwn
git-annex-mirror.mdwn
git-annex-move.mdwn
git-annex-multicast.mdwn
git-annex-numcopies.mdwn
git-annex-p2p.mdwn
git-annex-post-receive.mdwn
git-annex-pre-commit.mdwn
git-annex-preferred-content.mdwn
git-annex-proxy.mdwn
git-annex-readpresentkey.mdwn
git-annex-registerurl.mdwn
git-annex-reinit.mdwn
git-annex-reinject.mdwn
git-annex-rekey.mdwn
git-annex-remotedaemon.mdwn
git-annex-renameremote.mdwn forgot to add man page 2019-04-16 12:25:49 -04:00
git-annex-repair.mdwn
git-annex-required.mdwn
git-annex-resolvemerge.mdwn
git-annex-rmurl.mdwn
git-annex-schedule.mdwn
git-annex-semitrust.mdwn
git-annex-setkey.mdwn
git-annex-setpresentkey.mdwn
git-annex-shell.mdwn
git-annex-smudge.mdwn
git-annex-status.mdwn
git-annex-sync.mdwn --no-push and remote.name.annex-push prevent exporting trees to special remotes 2019-03-09 13:21:49 -04:00
git-annex-test.mdwn
git-annex-testremote.mdwn
git-annex-transferkey.mdwn
git-annex-transferkeys.mdwn
git-annex-trust.mdwn
git-annex-unannex.mdwn
git-annex-undo.mdwn
git-annex-ungroup.mdwn
git-annex-uninit.mdwn
git-annex-unlock.mdwn
git-annex-untrust.mdwn
git-annex-unused.mdwn doc clarification 2019-04-09 11:38:11 -04:00
git-annex-upgrade.mdwn
git-annex-vadd.mdwn
git-annex-vcycle.mdwn
git-annex-version.mdwn
git-annex-vfilter.mdwn
git-annex-vicfg.mdwn
git-annex-view.mdwn
git-annex-vpop.mdwn
git-annex-wanted.mdwn
git-annex-watch.mdwn
git-annex-webapp.mdwn
git-annex-whereis.mdwn
git-annex.mdwn added renameremote command 2019-04-15 13:49:03 -04:00
git-remote-tor-annex.mdwn
git-union-merge.mdwn
how_it_works.mdwn
index.mdwn
install.mdwn
internals.mdwn use colon not space to delimit content identifier list 2019-02-21 13:45:16 -04:00
license.mdwn update 2019-02-08 15:26:15 -04:00
location_tracking.mdwn
logo-old-bw.svg
logo-old.png
logo-old.svg
logo-old_small.png
logo.mdwn
logo.svg
logo_16x16.png
logo_32x32.png
logo_small.png
meta.mdwn
metadata.mdwn
news.mdwn
not.mdwn
polls.mdwn
preferred_content.mdwn
privacy.mdwn
profiling.mdwn
publicrepos.mdwn
related_software.mdwn
repomap.png
required_content.mdwn
scalability.mdwn
security.mdwn
shortcuts.mdwn
sidebar.mdwn
sitemap.mdwn
special_remotes.mdwn improve docs 2019-03-22 09:59:56 -04:00
stickers.mdwn
submodules.mdwn
summary.mdwn
sync.mdwn
testimonials.mdwn
thanks.mdwn
tips.mdwn
todo.mdwn don't list subpages of todos 2019-04-15 13:01:53 -04:00
transferring_data.mdwn
trust.mdwn
tuning.mdwn
upgrades.mdwn
users.mdwn
videos.mdwn
Void.mdwn
walkthrough.mdwn
workflow.mdwn