summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* windows does not like filenames starting with a dot, renameGravatar Joey Hess2016-04-08
|
* fix build with ghc 7.6.3Gravatar Joey Hess2016-04-08
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-08
|\
* | updateGravatar Joey Hess2016-04-08
| |
* | fix build on windows with older ghcGravatar Joey Hess2016-04-08
| |
* | hard links on windowsGravatar Joey Hess2016-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 calculationGravatar Joey Hess2016-04-08
| |
| * (no commit message)Gravatar 0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d67302016-04-08
| |
| * pull request for Bup.hsGravatar ggreif@8132a868199b4ffec14150c87f538dc06a5382202016-04-08
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-06
|\
* | devbogGravatar Joey Hess2016-04-06
| |
* | one little bug..Gravatar Joey Hess2016-04-06
| |
* | fix commit tree after merge into adjusted branchGravatar Joey Hess2016-04-06
| |
* | run out of tree merge with --no-ffGravatar Joey Hess2016-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 ↵Gravatar Joey Hess2016-04-06
| | | | | | | | branch
* | new method for merging changes into adjusted branch that avoids unncessary ↵Gravatar Joey Hess2016-04-06
| | | | | | | | | | | | merge conflicts Still needs work when there are actual merge conflicts.
| * (no commit message)Gravatar https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec2016-04-06
| |
| * (no commit message)Gravatar Gus2016-04-06
| |
| * Added a commentGravatar timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc29912016-04-06
| |
| * Added a commentGravatar timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc29912016-04-05
| |
| * Added a commentGravatar timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc29912016-04-05
|/
* sync: Show output of git commit.Gravatar Joey Hess2016-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.comGravatar Joey Hess2016-04-05
|\
* | another reasonGravatar Joey Hess2016-04-05
| |
| * Added a commentGravatar zarel2016-04-05
| |
| * (no commit message)Gravatar timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc29912016-04-05
| |
| * (no commit message)Gravatar timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc29912016-04-05
| |
| * Added a commentGravatar timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc29912016-04-05
| |
| * Added a commentGravatar szrc2016-04-05
| |
| * Added a commentGravatar timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc29912016-04-04
| |
* | hack to get escaped quotes right on git-annex-shell man pageGravatar Joey Hess2016-04-04
|/
* devblogGravatar Joey Hess2016-04-04
|
* commentGravatar Joey Hess2016-04-04
|
* wordingGravatar Joey Hess2016-04-04
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-04
|\
* | commentGravatar Joey Hess2016-04-04
| |
| * commentGravatar Antoine Beaupré2016-04-04
| |
| * simplify manpage example and ask another questionGravatar Antoine Beaupré2016-04-04
| | | | | | | | sorry for the noise again...
* | responseGravatar Joey Hess2016-04-04
|/
* responseGravatar Joey Hess2016-04-04
|
* commentGravatar Joey Hess2016-04-04
|
* commentGravatar Joey Hess2016-04-04
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-04
|\
* | comment and improve docsGravatar Joey Hess2016-04-04
| |
| * Added a comment: clarified manpageGravatar anarcat2016-04-04
| |
* | commentGravatar Joey Hess2016-04-04
| |
| * add examples on how to manually setup the remote keys setup by the assistantGravatar anarcat2016-04-04
| |
* | commentGravatar Joey Hess2016-04-04
| |
| * ugh. so it works with ~/.ssh/git-annexGravatar anarcat2016-04-04
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-04
|\