summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-09 13:51:49 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-09 13:51:49 -0400
commit20473a1744858a07e88dbc0e8c12c470f2f50d97 (patch)
treede5b7a8f9350741b614f1cf4e72478be9fc7921b /doc
parent1c5198025063ab758dda36c5b3ff54cd655f48b7 (diff)
update
Diffstat (limited to 'doc')
-rw-r--r--doc/design/adjusted_branches.mdwn11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index 3058b3e3a..da3a7e130 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -100,11 +100,17 @@ The new master branch can then be pushed out to remotes. The
adjusted/master branch is not pushed to remotes. `git-annex sync` should
automatically push master when adjusted/master is checked out.
+When push.default is "simple" (the new default), running `git push` when in
+adjusted/master won't push anything. It would with "matching". Pity. (I
+continue to feel git picked the wrong default here.) Users may find that
+surprising. Users of `git-annex sync` won't need to worry about it though.
+
## problems
Using `git checkout` when in an adjusted branch is problimatic, because a
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.
Tags are bit of a problem. If the user tags an ajusted branch, the tag
includes the local adjustments.
@@ -112,11 +118,6 @@ includes the local adjustments.
If the user refers to commit shas (in, eg commit messages), those won't be
visible to anyone else.
-When push.default is "simple" (the new default), running `git push` when in
-adjusted/master won't push anything. It would with "matching". Users may
-find that surprising. Users of `git-annex sync` won't need to worry about
-it though.
-
## integration with view branches
Entering a view from an adjusted branch should probably carry the filtering