e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
31 lines
1.1 KiB
Markdown
31 lines
1.1 KiB
Markdown
Instead of using `sync origin` for the first sync and a simple `sync` for the other syncs,
|
|
|
|
# on pc1
|
|
git annex init "pc1"
|
|
git annex direct
|
|
git annex add .
|
|
git annex sync origin # remote specified on the first sync
|
|
|
|
# add some files
|
|
git annex add .
|
|
git annex sync
|
|
|
|
I used `sync` first and only later I used `sync origin`
|
|
|
|
# on pc1
|
|
git annex init "pc1"
|
|
git annex direct
|
|
git annex add .
|
|
git annex sync
|
|
|
|
# add some files
|
|
git annex add .
|
|
git annex sync origin # remote specified on a later sync
|
|
|
|
These sequences of commands create two completely different git histories.
|
|
|
|
More important, if one clones on pc2 the first repository, they will see both the pc1 remote and the pc2 remote. Instead, if one clones on pc2 the repository created by the second combination of commands, they will see only the pc2 remote.
|
|
|
|
What commands should I use on pc1 to fix the history so that when pc2 clones from the origin repository it will see both the pc1 remote and its own local remote?
|
|
|
|
> [[done]]; fixed per my comments. --[[Joey]]
|