mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/doc
History
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 rename to avoid render as html 2018-10-16 11:23:31 -04:00
android update android docs for termux 2018-10-13 12:11:47 -04:00
assistant
automatic_conflict_resolution
backends update 2018-11-12 16:37:43 -04:00
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 Added a comment: Option to disable filename encyprtion 2018-12-29 01:13:21 +00:00
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 response 2019-01-22 17:11:21 -04:00
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 Added a comment 2018-10-08 21:43:17 +00:00
git-annex-sync Added a comment 2018-10-09 18:41:33 +00:00
git-annex-test
git-annex-unannex
git-annex-undo
git-annex-uninit response 2019-01-01 12:31:18 -04:00
git-annex-unlock Added a comment 2019-01-01 18:17:21 +00:00
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 response 2018-12-26 13:04:35 -04:00
profiling new comment (and rename for consistency) 2019-01-14 18:01:02 -04:00
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 added details about the URL backend 2018-10-12 20:28:25 +00:00
bare_repositories.mdwn
bugs.mdwn exclude the duplicate tag page from the list of bugs 2018-11-12 12:05:03 -04:00
builds.mdwn remove old android app autobuild 2018-10-13 12:13:13 -04:00
chunking.mdwn
coding_style.mdwn
comments.mdwn
contact.mdwn
contribute.mdwn update thanks, listing code and other significant non-financial contributors 2018-11-05 15:07:14 -04:00
copies.mdwn
design.mdwn
devblog.mdwn
direct_mode.mdwn link deprecation notice to tips/unlocked_files 2019-01-19 06:41:10 +00:00
distributed_version_control.mdwn
download.mdwn fix link on download page and add a few more to break later 2018-12-10 12:55:13 -04:00
encryption.mdwn annex.cachecreds: New config to allow disabling of credentials caching for special remotes. 2018-12-04 14:16:56 -04:00
favicon.ico
forum.mdwn
future_proofing.mdwn fix link 2018-10-26 16:21:34 -04:00
git-annex-add.mdwn some more v6 -> v7 doc changes 2018-10-26 13:56:36 -04:00
git-annex-addunused.mdwn
git-annex-addurl.mdwn
git-annex-adjust.mdwn mention annex.thin for unlock 2019-01-01 12:23:40 -04:00
git-annex-assistant.mdwn
git-annex-benchmark.mdwn new improved benchmark command that can benchmark anything git-annex does 2019-01-04 13:46:36 -04:00
git-annex-calckey.mdwn shorten some too-long descriptions 2019-01-16 14:16:32 -04:00
git-annex-checkpresentkey.mdwn
git-annex-config.mdwn
git-annex-contentlocation.mdwn
git-annex-copy.mdwn added -z 2018-09-20 16:11:47 -04:00
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 remove addition 2018-10-16 11:00:22 -04:00
git-annex-expire.mdwn
git-annex-export.mdwn document importree for S3 2019-04-23 13:19:08 -04:00
git-annex-find.mdwn add --branch option to git-annex find and mildly deprecate findref in favor of it 2018-12-09 14:10:37 -04:00
git-annex-findref.mdwn add --branch option to git-annex find and mildly deprecate findref in favor of it 2018-12-09 14:10:37 -04:00
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 remove redundant OPTIONS section 2018-11-15 22:38:35 -04:00
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 some more v6 -> v7 doc changes 2018-10-26 13:56:36 -04:00
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 defer updating unlocked files until after smudge filter 2018-10-25 15:08:20 -04:00
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 testremote: Support testing readonly remotes with the --test-readonly option 2019-01-17 12:44:52 -04:00
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 some more v6 -> v7 doc changes 2018-10-26 13:56:36 -04:00
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 rename page 2019-01-14 15:57:04 -04:00
publicrepos.mdwn
related_software.mdwn Updated Densho description , formerly "Japanese American Legacy Project", and total collection size. 2019-01-04 17:55:54 +00:00
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 update logo 2018-12-29 13:44:39 -04:00
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 clarify anarcat's change 2018-12-05 12:22:36 -04:00
users.mdwn
videos.mdwn
Void.mdwn
walkthrough.mdwn
workflow.mdwn