summaryrefslogtreecommitdiff
path: root/Command
Commit message (Expand)AuthorAge
* refactorGravatar Joey Hess2016-04-22
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Gravatar Joey Hess2016-04-22
* reinject: Added new mode which can reinject known files into the annex.Gravatar Joey Hess2016-04-22
* adjusted branches need git 2.2.0 or newerGravatar Joey Hess2016-04-22
* calckey: New plumbing command, calculates the key that would be used to refer...Gravatar Joey Hess2016-04-20
* reinject: When src file's content cannot be verified, leave it alone, instead...Gravatar Joey Hess2016-04-20
* fsck: Warn when core.sharedRepository is set and an annex object file's write...Gravatar Joey Hess2016-04-14
* Preserve execute bits of unlocked files in v6 mode.Gravatar Joey Hess2016-04-14
* webapp: When $HOME is a git repository, and has been initialized for use by g...Gravatar Joey Hess2016-04-13
* smudge: Print a warning when annex.thin is set, as git's smudge interface doe...Gravatar Joey Hess2016-04-13
* correct commentGravatar Joey Hess2016-04-13
* add AdjBranch newtype; some simplicationsGravatar Joey Hess2016-04-09
* hard links on windowsGravatar Joey Hess2016-04-08
* 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
* sync: Show output of git commit.Gravatar Joey Hess2016-04-05
* Merge branch 'adjustedbranch'Gravatar Joey Hess2016-03-31
|\
| * fixed merging of changes from adjusted branch + a remoteGravatar Joey Hess2016-03-31
| * autoinit on upgradeGravatar Joey Hess2016-03-31
| * made some progress on syncing adjusted branches, but still buggyGravatar Joey Hess2016-03-31
* | log --raw-date: Use to display seconds from unix epoch.Gravatar Joey Hess2016-03-29
* | log: Display time with time zone.Gravatar Joey Hess2016-03-29
| * prevent git-annex adjust changing things out from under the daemonGravatar Joey Hess2016-03-29
| * init: Automatically enter the adjusted unlocked branch when in a v6 repo on a...Gravatar Joey Hess2016-03-29
| * limit git annex adjust to v6 modeGravatar Joey Hess2016-03-29
| * option parser for adjust commandGravatar Joey Hess2016-03-29
| * Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-29
| |\ | |/ |/|
* | Correct git-annex info to include unlocked files in v6 repository.Gravatar Joey Hess2016-03-14
| * implement another adjustment -- easy to do now!Gravatar Joey Hess2016-03-11
| * Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-11
| |\ | |/ |/|
* | remove redundant start messageGravatar Joey Hess2016-03-09
* | refactorGravatar Joey Hess2016-03-09
* | dropkey --jsonGravatar Joey Hess2016-03-06
* | dropkey: Add --batch.Gravatar Joey Hess2016-03-06
* | Merge branch 'no-cbits'Gravatar Joey Hess2016-03-05
|\ \
| | * working toward adjusted commit propigationGravatar Joey Hess2016-03-03
| | * push original branch, not adjusted branchGravatar Joey Hess2016-03-03
| | * fix bug introduced in recent commitGravatar Joey Hess2016-02-29
| | * update sync branch to the orig branch when in adjusted branchGravatar Joey Hess2016-02-29
| | * make assistant aware of adjusted branches when mergingGravatar Joey Hess2016-02-29
| | * make sync aware of adjusted branchesGravatar Joey Hess2016-02-29
| | * Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-02-29
| | |\ | |_|/ |/| |
* | | metadata: Added -r to remove all current values of a field.Gravatar Joey Hess2016-02-29
* | | use DelMeta to unset tagGravatar Joey Hess2016-02-29
| | * adjusted branches, proof of conceptGravatar Joey Hess2016-02-25
| |/ |/|
* | info: Mention when run in a dead repository.Gravatar Joey Hess2016-02-19
* | fsck: When the only copy of a file is in a dead repository, mention the repos...Gravatar Joey Hess2016-02-19
* | annex.addunlockedGravatar Joey Hess2016-02-16
| * move old ghc compat code into separate module; eliminate WITH_CLIBSGravatar Joey Hess2016-02-15
|/
* fsck: Populate unlocked files in v6 repositories whose content is present in ...Gravatar Joey Hess2016-02-14