diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-06-01 13:20:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-06-01 13:20:13 -0400 |
| commit | 32e1a57dd4aedff43b07abe3a2ac8c0d871c2f2d (patch) | |
| tree | cc003b3ad685a6bbce35b25136ad193d73920c3c /doc | |
| parent | c005bc2887e886d3b48750b149bf5b155678a653 (diff) | |
comment
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_4_c019c5b4d1c2a7941aed8791b6749f5b._comment | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_4_c019c5b4d1c2a7941aed8791b6749f5b._comment b/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_4_c019c5b4d1c2a7941aed8791b6749f5b._comment new file mode 100644 index 000000000..8eb169ba9 --- /dev/null +++ b/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_4_c019c5b4d1c2a7941aed8791b6749f5b._comment @@ -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. +"""]] |