From a6a29451698e09b836c8bd848f0fa09a242e2dab Mon Sep 17 00:00:00 2001 From: Erik Flodin Date: Mon, 8 Feb 2021 22:49:32 +0100 Subject: [PATCH 1/2] Update pages to match new clone behavior (from #289) --- _docs/030_getting_started.md | 8 ++++---- _docs/110_faq.md | 20 -------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/_docs/030_getting_started.md b/_docs/030_getting_started.md index 3216402..aebbd34 100644 --- a/_docs/030_getting_started.md +++ b/_docs/030_getting_started.md @@ -22,10 +22,10 @@ Clone your existing repo using yadm. yadm clone yadm status -The `clone` command will attempt to `merge` your existing repository, but if it -fails, it will `stash` any conflicting data. See -[this question](faq#i-just-cloned-my-repository-and-conflicting-data-was-overwritten-why) -in the FAQ if you need help. +The `clone` command will attempt to check out all files that exist in the +repository. If a file already exists locally and has content that differs from +the one in the repository, the local file will be left unmodified and you'll +have to review and resolve the differences. --- diff --git a/_docs/110_faq.md b/_docs/110_faq.md index 53aabb4..ef3b812 100644 --- a/_docs/110_faq.md +++ b/_docs/110_faq.md @@ -8,17 +8,6 @@ permalink: /docs/faq ## Usage -### I just cloned my repository and conflicting data was overwritten. Why? - -Prior to cloning your repository, files managed by yadm already existed. For -example, imagine you are logged into a system and `$HOME/.bash_profile` already -exists. If you then clone your yadm repository—which also contains -`.bash_profile`—then you will likely get a conflict. Since version 1.07, -yadm responds by "stashing" these conflicts. To view the stashed data, you can -run `yadm stash show -p` from within your `$HOME` directory. If you want to -restore the stashed data, you can run `yadm stash apply` from within your -`$HOME` directory. - ### While committing I got the message, _"Please tell me who you are"_. Why? Whenever a Git commit is generated, Git requires information about the author of @@ -45,15 +34,6 @@ yadm gitconfig "user.name" "Alternate Name" Note: Configuring these settings directly in the yadm repo will require you to configure it each time you clone the repo. -### Why was I prompted to login twice while cloning my repo? - -yadm needs to query your repo to determine the default branch used. When you are -using a private repository, this additional query also requires authentication. -You can avoid the double login by specifying which branch to clone using the -`-b` option. - - yadm clone -b - ### How can I display untracked files with a `yadm status` command? By default, yadm is configured to ignore untracked files when displaying a From 8e72d93126048dc43ac83deb2142401beeda98db Mon Sep 17 00:00:00 2001 From: Erik Flodin Date: Mon, 8 Feb 2021 22:50:38 +0100 Subject: [PATCH 2/2] Add note about bootstrap.d contrib script to bootstrap page --- _docs/050_bootstrap.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/_docs/050_bootstrap.md b/_docs/050_bootstrap.md index fb19fee..a83ca99 100644 --- a/_docs/050_bootstrap.md +++ b/_docs/050_bootstrap.md @@ -167,6 +167,16 @@ if command -v vim >/dev/null 2>&1; then fi ``` +### Bootstrap directory + +By installing this [contributed bootstrap][bootstrap.d] script as the bootstrap +program, it is possible to split the bootstrap process into separate +scripts. Each script is placed in `$HOME/.config/yadm/bootstrap.d` and it is +possible to use the [alternate files](/docs/alternates) system to control which +systems that a specific bootstrap step is executed on. + +[bootstrap.d]: https://raw.githubusercontent.com/TheLocehiliosan/yadm/master/contrib/bootstrap/bootstrap-in-dir + --- _If you have suggestions for useful bootstrapping logic, let me know..._