mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/doc
History
Joey Hess cf449837ea
 run reconcileStaged even in smudge clean filter, using alternate code path 
Improved workaround for git 2.50 bug, avoding an occasional test suite
failure, as well as some situations where an unlocked file did not get
populated when adding another file to the repository with the same content.

This uses the alternate code path that was already using when there was
a conflict. Since that code path is not able to record its work,
it will redo the same work next time. If the only way reconcileStaged
is getting run is via the smudge clean filter, that could result in
more and more changes getting processed redundantly each time. Once
some other git-annex command runs and calls reconcileStaged, it
will stop redoing that work. I don't think the extra work will be a
problem.
2025-07-21 14:10:49 -04:00
..
android
Android
assistant
automatic_conflict_resolution
backends
bare_repositories
bugs run reconcileStaged even in smudge clean filter, using alternate code path 2025-07-21 14:10:49 -04:00
chunking
coding_style
contribute
copies
design improve 2025-03-11 12:54:34 -04:00
devblog Added a comment: yt-dlp did not put any media in its work directory 2025-04-15 14:15:37 +00:00
direct_mode
download
encryption comment 2025-05-14 14:04:18 -04:00
footer
forum response 2025-07-21 12:20:48 -04:00
future_proofing
git-annex-add
git-annex-addurl
git-annex-adjust
git-annex-benchmark
git-annex-checkpresentkey
git-annex-config Added a comment: Disabling "synced" branches 2025-04-24 02:34:59 +00:00
git-annex-copy
git-annex-dead merge in doc changes from master 2025-01-29 18:57:25 -04:00
git-annex-diffdriver
git-annex-direct
git-annex-drop
git-annex-enableremote
git-annex-export Added a comment: parameter --from not accepted 2024-08-14 14:27:54 +00:00
git-annex-find
git-annex-fsck response 2024-10-21 15:03:55 -04:00
git-annex-get
git-annex-import
git-annex-importfeed
git-annex-lookupkey
git-annex-matching-options
git-annex-metadata
git-annex-move
git-annex-p2p
git-annex-preferred-content
git-annex-reinject
git-annex-repair
git-annex-reregisterurl Added a comment 2024-11-11 22:18:37 +00:00
git-annex-rmurl
git-annex-setpresentkey
git-annex-sync
git-annex-test
git-annex-unannex
git-annex-undo
git-annex-uninit
git-annex-unlock Added a comment: We don’t need a 'git annex lock' after a 'git annex add', right? 2025-06-25 22:12:57 +00:00
git-annex-unused
git-annex-webapp
git-annex-whereis
git-annex-whereused merge in doc changes from master 2025-01-29 18:57:25 -04:00
how_it_works
install caps 2025-05-31 13:16:37 -04:00
internals
license
links
metadata
news add news item for git-annex 10.20250630 2025-06-30 10:05:56 -04:00
not
polls
preferred_content Added a comment: Re: default preferred content 2024-09-25 09:25:42 +00:00
profiling
projects prevent initialization with bad freeze/thaw hook configured 2025-05-27 12:54:31 -04:00
required_content
scalability
security
sims formatting 2024-09-25 14:50:17 -04:00
special_remotes comment 2025-06-23 13:34:00 -04:00
stickers
submodules
sync
templates
testimonials
thanks Revert "update" 2025-02-06 11:42:49 -04:00
tips IA S3 needs https now 2025-05-13 10:23:56 -04:00
todo Add --url option and url= preferred content expression 2025-07-21 12:13:40 -04:00
trust
tuning remove warnings about tuning being experimental 2024-10-22 13:27:25 -04:00
upgrades
use_case
users 2025-06-09 23:42:46 +00:00
videos
walkthrough
workflow
Android.mdwn
assistant.mdwn
automatic_conflict_resolution.mdwn
backends.mdwn Make VURL a proper list item 2024-10-17 09:18:04 +00:00
bare_repositories.mdwn
bugs.mdwn
builds.mdwn remove i386ancient and need at least debian stable to build 2025-01-01 14:15:55 -04:00
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 add: Consistently treat files in a dotdir as dotfiles, even when ran inside that dotdir 2024-11-13 13:43:01 -04:00
git-annex-addcomputed.mdwn findcomputed: New command, displays information about computed files. 2025-03-18 12:55:48 -04:00
git-annex-addunused.mdwn
git-annex-addurl.mdwn VURL verifyKeyContent True when there are no recorded equivkeys 2025-01-03 17:24:30 -04:00
git-annex-adjust.mdwn
git-annex-assist.mdwn
git-annex-assistant.mdwn
git-annex-backends.mdwn
git-annex-benchmark.mdwn
git-annex-calckey.mdwn
git-annex-checkpresentkey.mdwn
git-annex-common-options.mdwn S3: Send git-annex or other configured User-Agent. 2024-11-13 16:10:37 -04:00
git-annex-config.mdwn add: Consistently treat files in a dotdir as dotfiles, even when ran inside that dotdir 2024-11-13 13:43:01 -04:00
git-annex-configremote.mdwn
git-annex-contentlocation.mdwn
git-annex-copy.mdwn
git-annex-dead.mdwn
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 fix name of man page 2025-07-07 12:03:38 -04:00
git-annex-enableremote.mdwn
git-annex-examinekey.mdwn
git-annex-expire.mdwn
git-annex-export.mdwn export: Added --from option 2024-08-08 12:08:55 -04:00
git-annex-extendcluster.mdwn
git-annex-filter-branch.mdwn
git-annex-filter-process.mdwn
git-annex-find.mdwn
git-annex-findcomputed.mdwn findcompute --inputs 2025-03-19 15:39:05 -04:00
git-annex-findkeys.mdwn
git-annex-findref.mdwn
git-annex-fix.mdwn
git-annex-forget.mdwn
git-annex-fromkey.mdwn
git-annex-fsck.mdwn record fscked files in fsck db by default 2025-03-17 15:34:08 -04:00
git-annex-fuzztest.mdwn
git-annex-get.mdwn
git-annex-group.mdwn
git-annex-groupwanted.mdwn
git-annex-import.mdwn revert man page changes 2025-06-13 08:19:55 -04:00
git-annex-importfeed.mdwn
git-annex-indirect.mdwn
git-annex-info.mdwn
git-annex-init.mdwn pre-init config and hook 2025-01-13 14:22:49 -04:00
git-annex-initcluster.mdwn
git-annex-initremote.mdwn documentation for compute remote and associated commands 2025-02-19 14:29:18 -04:00
git-annex-inprogress.mdwn
git-annex-list.mdwn
git-annex-lock.mdwn
git-annex-log.mdwn log: Support --key, as well as --branch and --unused 2025-01-03 15:45:42 -04:00
git-annex-lookupkey.mdwn
git-annex-map.mdwn map: Support --json option 2025-05-28 14:17:28 -04:00
git-annex-matchexpression.mdwn git-annex sim command is working 2024-09-12 16:10:52 -04:00
git-annex-matching-expression.mdwn annex.addunlocked support for tree imports 2024-12-19 11:43:51 -04:00
git-annex-matching-options.mdwn Add --url option and url= preferred content expression 2025-07-21 12:13:40 -04:00
git-annex-maxsize.mdwn maxsize of 0 to disable 2024-09-09 09:32:43 -04:00
git-annex-merge.mdwn improve man page and comment 2025-01-03 13:05:23 -04:00
git-annex-metadata.mdwn
git-annex-migrate.mdwn
git-annex-mincopies.mdwn
git-annex-mirror.mdwn
git-annex-move.mdwn
git-annex-multicast.mdwn
git-annex-numcopies.mdwn
git-annex-oldkeys.mdwn
git-annex-p2p.mdwn
git-annex-p2phttp.mdwn p2phttp: Added --socket option 2025-07-07 16:40:02 -04:00
git-annex-post-receive.mdwn update 2024-08-07 11:49:53 -04:00
git-annex-pre-commit.mdwn
git-annex-preferred-content.mdwn Add --url option and url= preferred content expression 2025-07-21 12:13:40 -04:00
git-annex-proxy.mdwn
git-annex-pull.mdwn
git-annex-push.mdwn
git-annex-readpresentkey.mdwn
git-annex-recompute.mdwn findcomputed: New command, displays information about computed files. 2025-03-18 12:55:48 -04:00
git-annex-registerurl.mdwn
git-annex-reinit.mdwn
git-annex-reinject.mdwn
git-annex-rekey.mdwn
git-annex-remotedaemon.mdwn
git-annex-renameremote.mdwn
git-annex-repair.mdwn
git-annex-required.mdwn document empty expression 2024-12-13 13:31:21 -04:00
git-annex-reregisterurl.mdwn
git-annex-resolvemerge.mdwn
git-annex-restage.mdwn
git-annex-rmurl.mdwn
git-annex-satisfy.mdwn
git-annex-schedule.mdwn
git-annex-semitrust.mdwn
git-annex-setkey.mdwn
git-annex-setpresentkey.mdwn
git-annex-shell.mdwn
git-annex-sim.mdwn sim: document interruption and concurrency issues 2024-09-26 12:26:47 -04:00
git-annex-smudge.mdwn
git-annex-status.mdwn
git-annex-sync.mdwn
git-annex-test.mdwn
git-annex-testremote.mdwn
git-annex-transferkey.mdwn
git-annex-transferkeys.mdwn
git-annex-transferrer.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-unregisterurl.mdwn
git-annex-untrust.mdwn
git-annex-unused.mdwn
git-annex-updatecluster.mdwn
git-annex-updateproxy.mdwn added retrieveKeyFileInOrder and ORDERED to external special remote protocol 2024-10-15 15:40:14 -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 document empty expression 2024-12-13 13:31:21 -04:00
git-annex-watch.mdwn
git-annex-webapp.mdwn
git-annex-whereis.mdwn
git-annex-whereused.mdwn
git-annex.mdwn annex.fastcopy 2025-06-03 15:01:38 -04:00
git-remote-annex.mdwn
git-remote-tor-annex.mdwn
how_it_works.mdwn
index.mdwn
install.mdwn caps 2025-05-31 13:16:37 -04:00
internals.mdwn remove the git-union-merge command 2025-02-12 12:37:36 -04:00
license.mdwn
location_tracking.mdwn
logo-old-bw.svg
logo-old.png
logo-old.svg
logo-old_small.png
logo-with-cli.png
logo-with-cli.svg
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 balanced preferred content and --rebalance 2024-08-09 14:16:09 -04:00
privacy.mdwn
profiling.mdwn
projects.mdwn
publicrepos.mdwn
related_software.mdwn
repomap.png
required_content.mdwn
scalability.mdwn
security.mdwn
shortcuts.mdwn
sidebar.mdwn
sims.mdwn adds sims collection 2024-09-23 13:43:55 -04:00
sitemap.mdwn
special_remotes.mdwn sort special remote type list 2025-04-09 13:26:22 -04:00
stickers.mdwn
submodules.mdwn
summary.mdwn
sync.mdwn
testimonials.mdwn
thanks.mdwn layout 2025-01-08 13:55:24 -04:00
tips.mdwn
todo.mdwn
transferring_data.mdwn
trust.mdwn
tuning.mdwn remove warnings about tuning being experimental 2024-10-22 13:27:25 -04:00
upgrades.mdwn
users.mdwn
videos.mdwn
walkthrough.mdwn
workflow.mdwn