Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | pull request for Bup.hs | ggreif@8132a868199b4ffec14150c87f538dc06a538220 | 2016-04-08 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-04-06 |
|\ | |||
* | | devbog | Joey Hess | 2016-04-06 |
| | | |||
* | | one little bug.. | Joey Hess | 2016-04-06 |
| | | |||
* | | fix commit tree after merge into adjusted branch | Joey Hess | 2016-04-06 |
| | | |||
* | | run out of tree merge with --no-ff | Joey Hess | 2016-04-06 |
| | | | | | | | | | | | | This is how direct mode does it too, and somehow, for reasons that currently escape me, this makes git merge not care if it's run with an empty work tree. | ||
* | | fix auto merge conflict resolution when doing out of tree merge for adjusted ↵ | Joey Hess | 2016-04-06 |
| | | | | | | | | branch | ||
* | | new method for merging changes into adjusted branch that avoids unncessary ↵ | Joey Hess | 2016-04-06 |
| | | | | | | | | | | | | merge conflicts Still needs work when there are actual merge conflicts. | ||
| * | (no commit message) | https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec | 2016-04-06 |
| | | |||
| * | (no commit message) | Gus | 2016-04-06 |
| | | |||
| * | Added a comment | timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991 | 2016-04-06 |
| | | |||
| * | Added a comment | timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991 | 2016-04-05 |
| | | |||
| * | Added a comment | timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991 | 2016-04-05 |
|/ | |||
* | sync: Show output of git commit. | Joey Hess | 2016-04-05 |
| | | | | | | Rationalle: User might have hook scripts whose output they want to see. Also, git commit output may tell the user they forgot to add a file. The output is not too ugly when there's nothing to commit. | ||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-04-05 |
|\ | |||
* | | another reason | Joey Hess | 2016-04-05 |
| | | |||
| * | Added a comment | zarel | 2016-04-05 |
| | | |||
| * | (no commit message) | timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991 | 2016-04-05 |
| | | |||
| * | (no commit message) | timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991 | 2016-04-05 |
| | | |||
| * | Added a comment | timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991 | 2016-04-05 |
| | | |||
| * | Added a comment | szrc | 2016-04-05 |
| | | |||
| * | Added a comment | timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991 | 2016-04-04 |
| | | |||
* | | hack to get escaped quotes right on git-annex-shell man page | Joey Hess | 2016-04-04 |
|/ | |||
* | devblog | Joey Hess | 2016-04-04 |
| | |||
* | comment | Joey Hess | 2016-04-04 |
| | |||
* | wording | Joey Hess | 2016-04-04 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-04-04 |
|\ | |||
* | | comment | Joey Hess | 2016-04-04 |
| | | |||
| * | comment | Antoine Beaupré | 2016-04-04 |
| | | |||
| * | simplify manpage example and ask another question | Antoine Beaupré | 2016-04-04 |
| | | | | | | | | sorry for the noise again... | ||
* | | response | Joey Hess | 2016-04-04 |
|/ | |||
* | response | Joey Hess | 2016-04-04 |
| | |||
* | comment | Joey Hess | 2016-04-04 |
| | |||
* | comment | Joey Hess | 2016-04-04 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-04-04 |
|\ | |||
* | | comment and improve docs | Joey Hess | 2016-04-04 |
| | | |||
| * | Added a comment: clarified manpage | anarcat | 2016-04-04 |
| | | |||
* | | comment | Joey Hess | 2016-04-04 |
| | | |||
| * | add examples on how to manually setup the remote keys setup by the assistant | anarcat | 2016-04-04 |
| | | |||
* | | comment | Joey Hess | 2016-04-04 |
| | | |||
| * | ugh. so it works with ~/.ssh/git-annex | anarcat | 2016-04-04 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-04-04 |
|\ | |||
* | | v6: Close pointer file handles more quickly, to avoid problems on Windows. | Joey Hess | 2016-04-04 |
| | | | | | | | | | | | | Was using L.readFile, so the Handle would remain open until the garbage collector got around to it. Changed to explicit open and close, so we know it's always closed when the function returns. | ||
* | | comment | Joey Hess | 2016-04-04 |
| | | |||
* | | comment | Joey Hess | 2016-04-04 |
| | | |||
* | | comment | Joey Hess | 2016-04-04 |
| | | |||
| * | Clarified CHECKURL-MULTI syntax | 0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 | 2016-04-04 |
| | | |||
* | | comment | Joey Hess | 2016-04-04 |
| | | |||
* | | comment | Joey Hess | 2016-04-04 |
| | | |||
* | | todo | Joey Hess | 2016-04-04 |
|/ |