Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-07-09 | |
|\ | |||
* | | prospective fix for bad_merge_commit_deleting_all_files | 2014-07-09 | |
| | | | | | | | | | | Assuming my analysis of a race is correct. In any case, this certianly closes a race.. | ||
| * | Added a comment | 2014-07-09 | |
| | | |||
| * | Added a comment | 2014-07-09 | |
|/ | |||
* | format | 2014-07-09 | |
| | |||
* | removed | 2014-07-09 | |
| | |||
* | Added a comment: The guy with this bug. | 2014-07-09 | |
| | |||
* | Added a comment: The guy with this bug. | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Added a comment: theory | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | more info | 2014-07-09 | |
| | |||
* | bug | 2014-07-09 | |
| | |||
* | (no commit message) | 2014-07-09 | |
| | |||
* | new bug gpg does not ask for password inside tmux | 2014-07-09 | |
| | |||
* | (no commit message) | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Added a comment: Same happening here | 2014-07-09 | |
| | |||
* | (no commit message) | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | (no commit message) | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Added a comment | 2014-07-09 | |
| | |||
* | Reopening | 2014-07-09 | |
| | |||
* | Added a comment: It works now | 2014-07-08 | |
| | |||
* | Added a comment: package in debian backports shows the same error mesage | 2014-07-08 | |
| | |||
* | Added a comment | 2014-07-08 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-07-08 | |
|\ | |||
* | | Fix bug in automatic merge conflict resolution | 2014-07-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one side is an annexed symlink, and the other side is a non-annexed symlink. In this case, git-merge does not replace the annexed symlink in the work tree with the non-annexed symlink, which is different from it's handling of conflicts between annexed symlinks and regular files or directories. So, while git-annex generated the correct merge commit, the work tree didn't get updated to reflect it. See comments on bug for additional analysis. Did not add this to the test suite yet; just unloaded a truckload of firewood and am feeling lazy. This commit was sponsored by Adam Spiers. | ||
| * | Added a comment: analysis | 2014-07-08 | |
| | | |||
| * | Added a comment | 2014-07-08 | |
| | | |||
| * | (no commit message) | 2014-07-08 | |
|/ | |||
* | confirmed | 2014-07-08 | |
| | |||
* | fixed | 2014-07-08 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2014-07-08 | |
|\ | |||
* | | Fix git version that supported --no-gpg-sign. | 2014-07-08 | |
| | | | | | | | | | | This is weird, git describe said the commit landed in 1.8.5, but 1.9.3 does not have it on OSX. Assume 2.0.0. | ||
| * | Added a comment | 2014-07-08 | |
| | | |||
* | | update month | 2014-07-08 | |
| | | |||
| * | (no commit message) | 2014-07-08 | |
| | | |||
| * | (no commit message) | 2014-07-08 | |
| | | |||
| * | Added a comment | 2014-07-08 | |
| | | |||
| * | (no commit message) | 2014-07-08 | |
| | | |||
| * | Added a comment | 2014-07-08 | |
| | | |||
| * | (no commit message) | 2014-07-08 | |
| | | |||
| * | (no commit message) | 2014-07-08 | |
| | |