Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | windows does not like filenames starting with a dot, rename | 2016-04-08 | |
| | |||
* | fix build with ghc 7.6.3 | 2016-04-08 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-08 | |
|\ | |||
* | | update | 2016-04-08 | |
| | | |||
* | | fix build on windows with older ghc | 2016-04-08 | |
| | | |||
* | | hard links on windows | 2016-04-08 | |
| | | | | | | | | | | * annex.thin and annex.hardlink are now supported on Windows. * unannex --fast now makes hard links on Windows. | ||
* | | avoid withWorkTreeRelated affecting annex symlink calculation | 2016-04-08 | |
| | | |||
| * | (no commit message) | 2016-04-08 | |
| | | |||
| * | pull request for Bup.hs | 2016-04-08 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-06 | |
|\ | |||
* | | devbog | 2016-04-06 | |
| | | |||
* | | one little bug.. | 2016-04-06 | |
| | | |||
* | | fix commit tree after merge into adjusted branch | 2016-04-06 | |
| | | |||
* | | run out of tree merge with --no-ff | 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 ↵ | 2016-04-06 | |
| | | | | | | | | branch | ||
* | | new method for merging changes into adjusted branch that avoids unncessary ↵ | 2016-04-06 | |
| | | | | | | | | | | | | merge conflicts Still needs work when there are actual merge conflicts. | ||
| * | (no commit message) | 2016-04-06 | |
| | | |||
| * | (no commit message) | 2016-04-06 | |
| | | |||
| * | Added a comment | 2016-04-06 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
|/ | |||
* | sync: Show output of git commit. | 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 | 2016-04-05 | |
|\ | |||
* | | another reason | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
| | | |||
| * | (no commit message) | 2016-04-05 | |
| | | |||
| * | (no commit message) | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-04 | |
| | | |||
* | | hack to get escaped quotes right on git-annex-shell man page | 2016-04-04 | |
|/ | |||
* | devblog | 2016-04-04 | |
| | |||
* | comment | 2016-04-04 | |
| | |||
* | wording | 2016-04-04 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-04 | |
|\ | |||
* | | comment | 2016-04-04 | |
| | | |||
| * | comment | 2016-04-04 | |
| | | |||
| * | simplify manpage example and ask another question | 2016-04-04 | |
| | | | | | | | | sorry for the noise again... | ||
* | | response | 2016-04-04 | |
|/ | |||
* | response | 2016-04-04 | |
| | |||
* | comment | 2016-04-04 | |
| | |||
* | comment | 2016-04-04 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-04 | |
|\ | |||
* | | comment and improve docs | 2016-04-04 | |
| | | |||
| * | Added a comment: clarified manpage | 2016-04-04 | |
| | | |||
* | | comment | 2016-04-04 | |
| | | |||
| * | add examples on how to manually setup the remote keys setup by the assistant | 2016-04-04 | |
| | | |||
* | | comment | 2016-04-04 | |
| | | |||
| * | ugh. so it works with ~/.ssh/git-annex | 2016-04-04 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-04 | |
|\ |