Flag --managed to `add` all managed files about chezmoi HOT 4 CLOSED

@bradenhilton No.. I guess I find the description confusing. Does the "re" mean recursive or "again". If recursive, why have add -r? If again, does that mean add is not idempotent?

It's not recursive. It’s again.

$ chezmoi re-add -h
Description:
  Re-add modified files in the target state, preserving any encrypted_
  attributes. chezmoi will not overwrite templates, and all entries that are
  not files are ignored. Directories are recursed into by default.

  If no targets are specified then all modified files are re-added. If one or
  more targets are given then only those targets are re-added.

@halostatue Except for templates I always want the local file to overwrite what's in cm at this point. If I want to merge I'd rather do that in git but it hasn't come up yet. Unless I'm misunderstanding what merge-all does as well.

merge-all is essentially the same as a git merge, but it allows you to apply merging even to templates because you’re doing a three-way diff/merge operation (target [what you modified outside of chezmoi], source [the chezmoi file or template], and candidate target [what chezmoi will generate, which will be the same a source for non-templates]).

I’m using chezmoi on a single machine; I am typically using merge-all as my workflow to get changes back into chezmoi. Because I’m not on multiple machines, there will be no rebase merging to deal with.

I’m closing this because the feature you want is chezmoi re-add or chezmoi merge-all (I personally find chezmoi merge-all to be a more comprehensive workflow because it works with templates, too). There's no need to add a --managed flag to chezmoi add, and it will absolutely do the wrong for templates, encrypted attributes, and other special cases.

from chezmoi.

Have you tried re-add?

from chezmoi.

Or merge-all? Using merge-all is probably the better choice here given your current workflow.

from chezmoi.

@bradenhilton No.. I guess I find the description confusing. Does the "re" mean recursive or "again". If recursive, why have add -r? If again, does that mean add is not idempotent?

@halostatue Except for templates I always want the local file to overwrite what's in cm at this point. If I want to merge I'd rather do that in git but it hasn't come up yet. Unless I'm misunderstanding what merge-all does as well.

from chezmoi.