diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-11 20:16:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-11 20:16:02 -0400 |
| commit | aedbb77de224cec157da35a0718a66e45493979e (patch) | |
| tree | 29ca44f10a6486bf94887cf62da2a2ff49e47ec1 /doc/design/adjusted_branches.mdwn | |
| parent | 0391c95eda90aa5b84fda8e39fe3c7000904ff8b (diff) | |
update
Diffstat (limited to 'doc/design/adjusted_branches.mdwn')
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 442cbae60..d226e5304 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -62,9 +62,6 @@ it, so C does not remain in the adjusted branch history either. This will make other checkouts that are in the same adjusted branch end up with the same B' commit when they pull B. -It might be useful to have a post-commit hook that generates B and B' -and updates the branches. And/or `git-annex sync` could do it. - There may be multiple commits made to the adjusted branch before any get applied back to the original branch. This is handled by reverse filtering commits one at a time and rebasing the others on top. @@ -261,6 +258,11 @@ non-adjusted branch would then be checked out. But, we can just say, if you want to get into an adjusted branch, you have to run some command. Or, could make a post-checkout hook. +After a commit to an adjusted branch, `git push` won't do anything. The +user has to know to git-annex sync. (Even if a pre-commit hook propigated +the commit back to the master branch, `git push` wouldn't push it with the +default "matching" push strategy.) + Tags are bit of a problem. If the user tags an ajusted branch, the tag includes the local adjustments. [WORKTREE: not a problem] |