mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/doc
History
Joey Hess e9bfa8eaed avoid unnecessary auto-merge when only changing a file in the branch. 
Avoids doing auto-merging in commands that don't need fully current
information from the git-annex branch. In particular, git annex add no
longer needs to auto-merge. Affected commands: Anything that doesn't
look up data from the branch, but does write a change to it.

It might seem counterintuitive that we can change a value without first
making sure we have the current value. This optimisation works because
these two sequences are equivilant:

1. pull from remote
2. union merge
3. read file from branch
4. modify file and write to branch

vs.

1. read file from branch
2. modify file and write to branch
3. pull from remote
4. union merge

After either sequence, the git-annex branch contains the same logical content
for the modified file. (Possibly with lines in a different order or
additional old lines of course).
2011-11-12 15:15:57 -04:00
..
bugs map: Support remotes with /~/ and /~user/ 2011-11-11 16:18:53 -04:00
design fix link 2011-11-04 15:51:01 -04:00
download Added a comment 2011-05-28 16:04:51 +00:00
encryption Added a comment: Tahoe-LAFS comes with encryption 2011-05-18 04:32:17 +00:00
forum fix broken links 2011-11-08 12:23:03 -04:00
install warning about version of git-annex shipped in recent Ubuntu release 2011-11-09 14:37:14 -04:00
news add news item for git-annex 3.20111111 2011-11-11 16:29:57 -04:00
special_remotes fix broken links 2011-11-08 12:23:03 -04:00
templates layout 2011-03-31 16:13:24 -04:00
tips wiki updates 2011-11-08 12:16:02 -04:00
todo avoid unnecessary auto-merge when only changing a file in the branch. 2011-11-12 15:15:57 -04:00
upgrades fix broken links 2011-11-08 12:23:03 -04:00
use_case layout 2011-04-17 11:44:32 -04:00
users 2011-04-04 07:43:08 +00:00
walkthrough fix broken links 2011-11-08 12:23:03 -04:00
backends.mdwn use SHA256 by default 2011-11-04 15:51:01 -04:00
bare_repositories.mdwn a recipe for setting up a bare remote 2011-11-04 23:19:13 +00:00
bugs.mdwn update 2010-10-19 19:28:29 -04:00
comments.mdwn add comments page 2011-03-15 23:25:16 -04:00
contact.mdwn update with irc channel 2011-05-19 15:44:22 -04:00
copies.mdwn update documentation for new, neutered key-value backends 2011-08-28 16:28:38 -04:00
design.mdwn encryption design document 2011-04-03 14:34:00 -04:00
distributed_version_control.mdwn fix broken links 2011-11-08 12:23:03 -04:00
download.mdwn update 2011-07-02 17:14:27 -04:00
encryption.mdwn document encryption 2011-04-16 19:35:02 -04:00
feeds.mdwn add feed aggregator 2011-03-31 16:00:33 -04:00
forum.mdwn add 2010-11-14 14:07:58 -04:00
future_proofing.mdwn fix broken links 2011-11-08 12:23:03 -04:00
git-annex-shell.mdwn git-annex-shell: GIT_ANNEX_SHELL_READONLY and GIT_ANNEX_SHELL_LIMITED environment variables can be set to limit what commands can be run. 2011-10-15 19:06:35 -04:00
git-annex.mdwn better command name 2011-10-31 15:18:41 -04:00
git-union-merge.mdwn typo 2011-11-06 13:53:11 -04:00
GPL 3 2010-10-20 11:56:36 -04:00
index.mdwn add link 2011-10-17 14:28:30 -04:00
install.mdwn include --bindir in all cabal install examples 2011-09-25 14:26:05 -04:00
internals.mdwn add timestamps to remote.log 2011-10-06 16:07:58 -04:00
location_tracking.mdwn update documentation that mentioned .git-annex/ 2011-06-22 17:26:34 -04:00
logo.png update 2010-11-13 23:32:56 -04:00
logo_small.png update 2010-11-13 23:32:56 -04:00
meta.mdwn fix 2011-11-08 12:24:56 -04:00
news.mdwn avoid building news page when building doc wiki for package 2010-12-02 21:37:55 -04:00
not.mdwn point to new extension now in mercurial 2011-11-02 12:02:04 -04:00
repomap.png scaled 2011-03-04 15:15:55 -04:00
special_remotes.mdwn documentation/warning message update for future feature 2011-09-23 18:04:38 -04:00
summary.mdwn split out summary and inline raw 2011-03-06 12:22:56 -04:00
tips.mdwn reorg 2011-10-17 13:56:36 -04:00
todo.mdwn reorg 2010-10-25 11:47:45 -04:00
transferring_data.mdwn update 2011-08-16 21:16:23 -04:00
trust.mdwn Add --trust, --untrust, and --semitrust options. 2011-06-01 17:57:31 -04:00
upgrades.mdwn update 2011-07-08 01:26:18 -04:00
users.mdwn add 2010-11-14 14:14:27 -04:00
walkthrough.mdwn remove optimize subcommand; use --auto instead 2011-09-15 13:30:04 -04:00