mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

push details

Browse source
This commit is contained in:
Joey Hess 2016-02-09 13:08:34 -04:00
parent a7b3d8574e
commit 6dd9b2b63b
Failed to extract signature
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/design/adjusted_branches.mdwn
View file

@ -33,9 +33,9 @@ the original branch yet.
Then we need to get from that commit to one with the filters reversed, Then we need to get from that commit to one with the filters reversed,
which should be the same as if the adjusted branch had not been used. which should be the same as if the adjusted branch had not been used.
This commit gets added onto the original branch.
Note that this commit should have as its parent the tip of the original So, the branches would look like this:
branch. So, the branches would look like this:
master adjusted/master master adjusted/master
A ---filter----> A A ---filter----> A
@ -56,7 +56,8 @@ filter. This will make other checkouts that are in the same adjusted branch
end up with the same B'' commit when they pull B. end up with the same B'' commit when they pull B.
It might be useful to have a post-commit hook that generates the It might be useful to have a post-commit hook that generates the
reverse-filtered commit and updates the original branch. reverse-filtered commit and updates the original branch. And/or
`git-annex sync` could do it.
The new master branch can then be pushed out to remotes. The The new master branch can then be pushed out to remotes. The
adjusted/master branch is not pushed to remotes. `git-annex sync` should adjusted/master branch is not pushed to remotes. `git-annex sync` should
@ -80,9 +81,10 @@ includes the local adjustments.
If the user refers to commit shas (in, eg commit messages), those won't be If the user refers to commit shas (in, eg commit messages), those won't be
visible to anyone else. visible to anyone else.
Running `git push` when in adjusted/master won't push anything When push.default is "simple" (the new default), running `git push` when in
(with "matching" push strategy). Users may find that surprising. adjusted/master won't push anything. It would with "matching". Users may
Users of `git-annex sync` won't need to worry about it though. find that surprising. Users of `git-annex sync` won't need to worry about
it though.
## integration with view branches ## integration with view branches