summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | run out of tree merge with --no-ffGravatar Joey Hess2016-04-06
* | fix auto merge conflict resolution when doing out of tree merge for adjusted ...Gravatar Joey Hess2016-04-06
* | new method for merging changes into adjusted branch that avoids unncessary me...Gravatar Joey Hess2016-04-06
| * (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
* 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
* | 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
|\
* | v6: Close pointer file handles more quickly, to avoid problems on Windows.Gravatar Joey Hess2016-04-04
* | commentGravatar Joey Hess2016-04-04
* | commentGravatar Joey Hess2016-04-04
* | commentGravatar Joey Hess2016-04-04
| * Clarified CHECKURL-MULTI syntaxGravatar 0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d67302016-04-04
* | commentGravatar Joey Hess2016-04-04
* | commentGravatar Joey Hess2016-04-04
* | todoGravatar Joey Hess2016-04-04
|/
* still bug with sync in adjusted branchGravatar Joey Hess2016-04-04
* deal with cloning a repo that has an ajdusted branch checked outGravatar Joey Hess2016-04-04
* updateGravatar Joey Hess2016-04-04
* make way for git checkout outputGravatar Joey Hess2016-04-04
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-04
|\