| Commit message (Expand) | Author | Age |
* | enableremote: Can now be used to explicitly enable git-annex to use git remot... | Joey Hess | 2016-05-24 |
* | Pass the various gnupg-options configs to gpg in several cases where they wer... | Joey Hess | 2016-05-23 |
* | remove unused | Joey Hess | 2016-05-23 |
* | adjust: Add --fix adjustment, which is useful when the git directory is in a ... | Joey Hess | 2016-05-16 |
* | add: Adding a v6 pointer file used to annex it; now the pointer file is added... | Joey Hess | 2016-05-16 |
* | reorder associated file db update | Joey Hess | 2016-05-16 |
* | assistant: Fix race in v6 mode that caused downloaded file content to sometim... | Joey Hess | 2016-05-16 |
* | adjust: If the adjusted branch already exists, avoid overwriting it, since it... | Joey Hess | 2016-05-13 |
* | fsck: When a key is not previously known in the location log, record somethin... | Joey Hess | 2016-05-10 |
* | fix overindent | Joey Hess | 2016-05-10 |
* | version: Display OS version and architecture too. | Joey Hess | 2016-05-05 |
* | fix build warning on windows and android | Joey Hess | 2016-05-05 |
* | map: Hide dead repositories that are not connected to the graph. | Joey Hess | 2016-05-04 |
* | Fix bug that sometimes prevented git-annex smudge --clean from consuming all ... | Joey Hess | 2016-05-02 |
* | refactor | Joey Hess | 2016-04-22 |
* | assistant: Deal with upcoming git's refusal to merge unrelated histories by d... | Joey Hess | 2016-04-22 |
* | reinject: Added new mode which can reinject known files into the annex. | Joey Hess | 2016-04-22 |
* | adjusted branches need git 2.2.0 or newer | Joey Hess | 2016-04-22 |
* | calckey: New plumbing command, calculates the key that would be used to refer... | Joey Hess | 2016-04-20 |
* | reinject: When src file's content cannot be verified, leave it alone, instead... | Joey Hess | 2016-04-20 |
* | fsck: Warn when core.sharedRepository is set and an annex object file's write... | Joey Hess | 2016-04-14 |
* | Preserve execute bits of unlocked files in v6 mode. | Joey Hess | 2016-04-14 |
* | webapp: When $HOME is a git repository, and has been initialized for use by g... | Joey Hess | 2016-04-13 |
* | smudge: Print a warning when annex.thin is set, as git's smudge interface doe... | Joey Hess | 2016-04-13 |
* | correct comment | Joey Hess | 2016-04-13 |
* | add AdjBranch newtype; some simplications | Joey Hess | 2016-04-09 |
* | hard links on windows | Joey Hess | 2016-04-08 |
* | run out of tree merge with --no-ff | Joey Hess | 2016-04-06 |
* | fix auto merge conflict resolution when doing out of tree merge for adjusted ... | Joey Hess | 2016-04-06 |
* | sync: Show output of git commit. | Joey Hess | 2016-04-05 |
* | Merge branch 'adjustedbranch' | Joey Hess | 2016-03-31 |
|\ |
|
| * | fixed merging of changes from adjusted branch + a remote | Joey Hess | 2016-03-31 |
| * | autoinit on upgrade | Joey Hess | 2016-03-31 |
| * | made some progress on syncing adjusted branches, but still buggy | Joey Hess | 2016-03-31 |
* | | log --raw-date: Use to display seconds from unix epoch. | Joey Hess | 2016-03-29 |
* | | log: Display time with time zone. | Joey Hess | 2016-03-29 |
| * | prevent git-annex adjust changing things out from under the daemon | Joey Hess | 2016-03-29 |
| * | init: Automatically enter the adjusted unlocked branch when in a v6 repo on a... | Joey Hess | 2016-03-29 |
| * | limit git annex adjust to v6 mode | Joey Hess | 2016-03-29 |
| * | option parser for adjust command | Joey Hess | 2016-03-29 |
| * | Merge branch 'master' into adjustedbranch | Joey Hess | 2016-03-29 |
| |\
| |/
|/| |
|
* | | Correct git-annex info to include unlocked files in v6 repository. | Joey Hess | 2016-03-14 |
| * | implement another adjustment -- easy to do now! | Joey Hess | 2016-03-11 |
| * | Merge branch 'master' into adjustedbranch | Joey Hess | 2016-03-11 |
| |\
| |/
|/| |
|
* | | remove redundant start message | Joey Hess | 2016-03-09 |
* | | refactor | Joey Hess | 2016-03-09 |
* | | dropkey --json | Joey Hess | 2016-03-06 |
* | | dropkey: Add --batch. | Joey Hess | 2016-03-06 |
* | | Merge branch 'no-cbits' | Joey Hess | 2016-03-05 |
|\ \ |
|
| | * | working toward adjusted commit propigation | Joey Hess | 2016-03-03 |