| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | convert notBareRepo to a CommandCheck |  Joey Hess | 2012-12-29 |
| | | | | | | | This avoids some small overhead by only running the check once per command; it also ensures that, even if the command doesn't find anything to run on, it still fails to run when in a bare repo. | ||
| * | partial and incomplete automatic merging in direct mode | Joey Hess | 2012-12-18 |
| | | | | | Handles our file right, but not theirs. | ||
| * | direct mode merging works! | Joey Hess | 2012-12-18 |
| | | | | | | Automatic merge resoltion code needs to be fixed to preserve objects from direct mode files. | ||
| * | add ok's | Joey Hess | 2012-12-13 |
| | | |||
| * | added direct and indirect commands | Joey Hess | 2012-12-13 |
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| summaryrefslogtreecommitdiff |