mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/doc
History
Joey Hess 69053a93a2
resolvemerge: Improve cleanup of files that were deleted by one side of a conflicted merge, and modified by the other side 
This case was handled by cleanConflictCruft, but only when the annexed
file's object was present. When not present, it left the annexed file
with the original name, not checked into git, while adding the variant
file. So, add an explicit deletion of the deleted file in this case.

My specific case where this happened actually involves
merge.directoryRenames=conflict. After a merge involving that,
the situation was the file appears as "added by them", because that
caused the file that they added to be moved into a directory we renamed.

That case is the same as them adding a modified version of the file,
while we deleted it. (Except for the history of the file, since it's a
new file, but this doesn't look at history.)

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2020-09-07 12:25:57 -04:00
..
Android Added a comment: Use curl instead of wget 2020-07-18 22:44:20 +00:00
android
assistant
automatic_conflict_resolution
backends
bare_repositories
bugs resolvemerge: Improve cleanup of files that were deleted by one side of a conflicted merge, and modified by the other side 2020-09-07 12:25:57 -04:00
chunking
coding_style
contribute comment 2020-06-30 11:17:38 -04:00
copies
design async extension done 2020-08-14 15:24:34 -04:00
devblog async extension done 2020-08-14 15:24:34 -04:00
direct_mode
download
encryption
footer
forum fix example: meant to prune --force and include rest of output 2020-09-02 15:51:49 +00:00
future_proofing
git-annex-addurl
git-annex-adjust Added a comment: Get missing files in --hide-missing branch 2020-06-05 19:14:26 +00:00
git-annex-checkpresentkey
git-annex-config
git-annex-copy
git-annex-direct
git-annex-drop
git-annex-enableremote
git-annex-find Added a comment: "dry run" option 2020-04-21 19:04:07 +00:00
git-annex-importfeed
git-annex-lookupkey
git-annex-metadata
git-annex-move
git-annex-p2p
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 Update name of attribute in haskellPackages. 2020-08-28 21:52:18 +00:00
internals expand 2020-07-03 14:42:04 -04:00
license
links
metadata
news add news item for git-annex 8.20200810 2020-08-10 19:22:55 -04:00
not
polls
preferred_content improve documentation 2020-04-13 12:33:35 -04:00
profiling
projects
required_content
scalability
security
special_remotes httpalso: support exporttree=yes 2020-09-02 11:26:00 -04:00
stickers
sync
templates
testimonials
thanks update 2020-09-05 11:36:47 -04:00
tips httpalso: support exporttree=yes 2020-09-02 11:26:00 -04:00
todo import: Retry downloads that fail 2020-09-04 13:54:05 -04:00
trust
tuning
upgrades
use_case
users 2020-07-03 07:36:41 +00:00
videos
walkthrough
workflow
Android.mdwn
assistant.mdwn
automatic_conflict_resolution.mdwn
backends.mdwn E variant of external backend keys 2020-07-29 17:12:22 -04:00
bare_repositories.mdwn
bugs.mdwn add priority tags 2020-03-25 13:05:09 -04:00
builds.mdwn make the git-annex-snapshot a link to the log 2020-04-28 15:54:34 -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 bad edit 2020-04-13 09:16:39 +00:00
future_proofing.mdwn
git-annex-add.mdwn man pages improvements 2020-05-12 09:07:45 -04:00
git-annex-addunused.mdwn
git-annex-addurl.mdwn addurl --preserve-filename and a few related changes 2020-05-08 16:22:55 -04:00
git-annex-adjust.mdwn
git-annex-assistant.mdwn
git-annex-benchmark.mdwn
git-annex-calckey.mdwn
git-annex-checkpresentkey.mdwn improve docs and close incorrect bug report 2020-06-16 13:45:00 -04:00
git-annex-config.mdwn
git-annex-contentlocation.mdwn
git-annex-copy.mdwn --auto doc wording 2020-04-13 16:12:48 -04:00
git-annex-dead.mdwn
git-annex-describe.mdwn
git-annex-diffdriver.mdwn
git-annex-direct.mdwn
git-annex-drop.mdwn man pages improvements 2020-05-12 09:07:45 -04:00
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 preferred content for import/export 2020-08-10 15:35:26 -04:00
git-annex-find.mdwn
git-annex-findref.mdwn
git-annex-fix.mdwn
git-annex-forget.mdwn
git-annex-fromkey.mdwn
git-annex-fsck.mdwn close not really a bug, and improve fsck man page 2020-04-27 12:13:35 -04:00
git-annex-fuzztest.mdwn
git-annex-get.mdwn man pages improvements 2020-05-12 09:07:45 -04:00
git-annex-group.mdwn
git-annex-groupwanted.mdwn
git-annex-import.mdwn document preferred content for import/export 2020-08-10 15:35:26 -04:00
git-annex-importfeed.mdwn document the 2_ files 2020-06-24 14:31:46 -04:00
git-annex-indirect.mdwn
git-annex-info.mdwn
git-annex-init.mdwn auto-init autoenable=yes 2020-05-27 12:40:35 -04:00
git-annex-initremote.mdwn auto-init autoenable=yes 2020-05-27 12:40:35 -04:00
git-annex-inprogress.mdwn
git-annex-list.mdwn
git-annex-lock.mdwn man pages improvements 2020-05-12 09:07:45 -04:00
git-annex-log.mdwn
git-annex-lookupkey.mdwn
git-annex-map.mdwn
git-annex-matchexpression.mdwn
git-annex-matching-expression.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 improve documentation 2020-04-13 12:33:35 -04:00
git-annex-multicast.mdwn
git-annex-numcopies.mdwn
git-annex-p2p.mdwn improve docs 2020-05-05 12:39:38 -04:00
git-annex-post-receive.mdwn
git-annex-pre-commit.mdwn
git-annex-preferred-content.mdwn improve documentation 2020-04-13 12:33:35 -04:00
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
git-annex-repair.mdwn
git-annex-required.mdwn
git-annex-resolvemerge.mdwn make automerge behavior when one side deleted explict 2020-09-07 12:01:03 -04:00
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 clarify 2020-07-03 14:31:08 -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 man pages improvements 2020-05-12 09:07:45 -04:00
git-annex-untrust.mdwn
git-annex-unused.mdwn
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 whereis: Added --format option. 2020-05-19 16:20:56 -04:00
git-annex.mdwn Exposed annex.forward-retry git config 2020-09-04 15:16:40 -04:00
git-remote-tor-annex.mdwn
git-union-merge.mdwn
how_it_works.mdwn
index.mdwn
install.mdwn
internals.mdwn
license.mdwn
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
projects.mdwn
publicrepos.mdwn
related_software.mdwn
repomap.png
required_content.mdwn
scalability.mdwn
security.mdwn
shortcuts.mdwn
sidebar.mdwn
sitemap.mdwn
special_remotes.mdwn rename http special remote to httpalso 2020-09-02 10:41:53 -04:00
stickers.mdwn
submodules.mdwn
summary.mdwn
sync.mdwn
testimonials.mdwn
thanks.mdwn update 2020-08-05 17:47:55 -04:00
tips.mdwn
todo.mdwn add priority tags 2020-03-25 13:05:09 -04:00
transferring_data.mdwn
trust.mdwn
tuning.mdwn
upgrades.mdwn
users.mdwn
videos.mdwn
walkthrough.mdwn
workflow.mdwn