From b9d59cf7219ec1350549fd25fceac2437c0f7a54 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Feb 2023 12:48:31 -0400 Subject: [PATCH] document sync in adjusted branch behavior This was documented in the git-annex-adjust man page, but not in git-annex-sync --- doc/git-annex-sync.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/git-annex-sync.mdwn b/doc/git-annex-sync.mdwn index 572abec586..4f5b66e247 100644 --- a/doc/git-annex-sync.mdwn +++ b/doc/git-annex-sync.mdwn @@ -45,6 +45,10 @@ ever happens when --content is used.) The remote's `remote..annex-tracking-branch` also must be configured, and have the same value as the currently checked out branch. +When [[git-annex-adjust]](1) has been used to check out an adjusted branch, +running sync will propagate changes that have been made back to the +parent branch, without propagating the adjustments. + # OPTIONS * `[remote]`