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

comment

Browse source
This commit is contained in:
Joey Hess 2017-06-01 13:20:13 -04:00
parent 02df5c5932
commit ca0736cc91
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_4_c019c5b4d1c2a7941aed8791b6749f5b._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2017-06-01T17:14:28Z"
content="""
Well, a git `update` hook is the only way to utterly prevent non-ff's being
pushed.
Since you're checking out the repository fresh each time, your scripts
could use `git annex sync --no-pull`. That would fail if someone else
pushed work to the repo in the meantime, and you could then use whatever
git commands make sense for you to fetch and rebase on top of the new changes.
"""]]