diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-26 15:53:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-26 15:53:05 -0400 |
| commit | e6b5913428189abb834bd52b6d4c562219aacdf6 (patch) | |
| tree | da7808ec8e3222a2023b7a28d7960513ca82d1e0 /doc | |
| parent | 5fb1f657d783d80b9c41bdbc7b159ff1483c271e (diff) | |
sync: print a hint about receive.denyNonFastForwards when a push fails
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/assistant/release_notes.mdwn | 9 | ||||
| -rw-r--r-- | doc/bugs/Windows_and_Linux_in_direct_mode_confuses_git.mdwn | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn index b7f61c373..1b1ece0a0 100644 --- a/doc/assistant/release_notes.mdwn +++ b/doc/assistant/release_notes.mdwn @@ -1,12 +1,3 @@ -## 4.20131025 - -Note that all past versions of the assistant, when used to create a -git repository on a ssh server, set up the repository in a way that -prevents `git annex sync` from working (although the assistant can sync -with it). To fix this misconfiguration, you can ssh to the server -and run this command inside the bare git repository: -`git config receive.denyNonFastforwards false` - ## version 4.20131024 This version fixes several different bugs that could cause the webapp to diff --git a/doc/bugs/Windows_and_Linux_in_direct_mode_confuses_git.mdwn b/doc/bugs/Windows_and_Linux_in_direct_mode_confuses_git.mdwn index 100549120..dd4b6a921 100644 --- a/doc/bugs/Windows_and_Linux_in_direct_mode_confuses_git.mdwn +++ b/doc/bugs/Windows_and_Linux_in_direct_mode_confuses_git.mdwn @@ -377,3 +377,8 @@ $ # End of transcript or log. """]] + +> Apparently `test.git` had `receive.denyNonFastForwards` +> set to true, which prevents the forced pushing `git annex sync` +> needs to do. I have made it print out a hint about this setting +> when a push failes. [[done]] --[[Joey]] |