summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-04-10
|\
* | devblogGravatar Joey Hess2015-04-10
| |
* | unused importGravatar Joey Hess2015-04-10
| |
| * Added a commentGravatar https://launchpad.net/~eliasson2015-04-10
| |
| * Added a commentGravatar http://lhealy.livejournal.com/2015-04-10
|/
* spotted a few more places where diff-tree needed --Gravatar Joey Hess2015-04-09
| | | | | | None of these are very likely at all to ever be ambiguous, since tree refs almost never have symbolic names and the sha is very unlikely to be in the work tree.. But, let's get it right!
* fix union merge to call diff-index with -- after the refGravatar Joey Hess2015-04-09
| | | | | Otherwise, if there's a file in the repo with a name matching the ref, git could get confused and the merge not work.
* Fix activity log parsing.Gravatar Joey Hess2015-04-09
| | | | | I had some cargo culting in there that used the wrong type, so it failed to parse old logs, and overwrote them with the new log.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-04-09
|\
* | commentGravatar Joey Hess2015-04-09
| |
| * Added a commentGravatar https://launchpad.net/~eliasson2015-04-09
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-04-09
|\
* | add news item for git-annex 5.20150409Gravatar Joey Hess2015-04-09
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkQOUUx4LVAk6EnstSLvdv7gZc0NsRlHXw2015-04-09
| |
* | devblog5.20150409Gravatar Joey Hess2015-04-09
| |
* | responseGravatar Joey Hess2015-04-09
|/
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A2015-04-09
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawl67y6EP2HTErhFl6ch4vDUHym6CH68Vnw2015-04-09
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawl67y6EP2HTErhFl6ch4vDUHym6CH68Vnw2015-04-09
|
* contentlocationn: New plumbing command.Gravatar Joey Hess2015-04-09
|
* prep releaseGravatar Joey Hess2015-04-09
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-04-09
|\
* | fix webapp reversion caused by relative path changesGravatar Joey Hess2015-04-09
| | | | | | | | | | | | | | webapp: When adding another local repository, and combining it with the current repository, the new repository's remote path was set to "." rather than the path to the current repository. This was a reversion caused by the relative path changes in 5.20150113.
* | followupGravatar Joey Hess2015-04-09
| |
* | followupGravatar Joey Hess2015-04-09
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A2015-04-09
| |
* | cannot reproduceGravatar Joey Hess2015-04-09
|/
* followup to bug I cannot reproduce, and analysis based presumptive fixGravatar Joey Hess2015-04-09
|
* followupGravatar Joey Hess2015-04-09
|
* commentGravatar Joey Hess2015-04-09
|
* moreinfo neededGravatar Joey Hess2015-04-09
|
* This fixes a bug in the assistant introduced by the literal pathspec changes ↵Gravatar Joey Hess2015-04-09
| | | | | | | | | | | in version 5.20150406. git-checkignore refuses to work if any pathspec options are set. Urgh. I audited the rest of git, and no other commands used by git-annex have such limitations. Indeed, AFAICS, *all* other commands support --literal-pathspecs. So, worked around this where git-checkignore is called.
* importfeed: Error out when passed a non-url.Gravatar Joey Hess2015-04-09
|
* importfeed: Fix feed download when curl is used.Gravatar Joey Hess2015-04-09
| | | | | This bug used to only afflict file:/// urls, but became more exposed by b1483ee577dded9e00f8d82d52a806ee02888b2c.
* cleanupGravatar Joey Hess2015-04-09
|
* info: Display repository mode: bare when in a bare (non-direct mode) repo.Gravatar Joey Hess2015-04-09
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-04-09
|\
* | proxy: Made it work when run in a new repository before initial commit.Gravatar Joey Hess2015-04-09
| |
| * (no commit message)Gravatar https://launchpad.net/~eliasson2015-04-09
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo2015-04-09
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc2015-04-09
| |
| * Added a comment: I'm with Remy hereGravatar https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc2015-04-09
| |
| * explicitely mention --force in tip bodyGravatar https://id.koumbit.net/anarcat2015-04-09
| |
* | took another look at thisGravatar Joey Hess2015-04-08
| |
* | quick look at git-lfsGravatar Joey Hess2015-04-08
| |
| * (no commit message)Gravatar http://lhealy.livejournal.com/2015-04-08
|/
* wordingGravatar Joey Hess2015-04-08
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-04-08
|\
* | add: If annex.largefiles is set and does not match a file that's being ↵Gravatar Joey Hess2015-04-08
| | | | | | | | added, the file will be checked into git rather than being added to the annex. Previously, git annex add skipped over such files; this new behavior is more useful in direct mode.
| * (no commit message)Gravatar skew2015-04-08
| |