mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Command
History
Joey Hess 46e3319995
assistant: Deal with upcoming git's refusal to merge unrelated histories by default 
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.

Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
2016-04-22 14:26:44 -04:00
..
Add.hs annex.addunlocked 2016-02-16 14:43:43 -04:00
AddUnused.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
AddUrl.hs annex.addunlocked 2016-02-16 14:43:43 -04:00
Adjust.hs adjusted branches need git 2.2.0 or newer 2016-04-22 12:29:32 -04:00
Assistant.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Benchmark.hs change keys database to use IKey type with more efficient serialization 2016-01-12 14:01:50 -04:00
CalcKey.hs calckey: New plumbing command, calculates the key that would be used to refer to a file 2016-04-20 13:50:26 -04:00
CheckPresentKey.hs avoid --batch crashing if a remote fails to be accessed 2016-02-12 16:48:03 -04:00
Commit.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
ConfigList.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
ContentLocation.hs Fix reversion in lookupkey, contentlocation, and examinekey which caused them to sometimes output side messages. 2016-01-29 13:20:24 -04:00
Copy.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Dead.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Describe.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
DiffDriver.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Direct.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Drop.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
DropKey.hs dropkey --json 2016-03-06 12:58:36 -04:00
DropUnused.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
EnableRemote.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
ExamineKey.hs Fix reversion in lookupkey, contentlocation, and examinekey which caused them to sometimes output side messages. 2016-01-29 13:20:24 -04:00
Expire.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Find.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
FindRef.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Fix.hs Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
Forget.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
FromKey.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Fsck.hs fsck: Warn when core.sharedRepository is set and an annex object file's write bit is not set and cannot be set due to the file being owned by a different user. 2016-04-14 15:36:53 -04:00
FuzzTest.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
GCryptSetup.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Get.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Group.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
GroupWanted.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Help.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Import.hs annex.largefiles can be configured in .gitattributes too 2016-02-02 15:18:17 -04:00
ImportFeed.hs remove 3 build flags 2016-01-26 08:14:57 -04:00
InAnnex.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Indirect.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Info.hs info: Mention when run in a dead repository. 2016-02-19 15:16:52 -04:00
Init.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
InitRemote.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
List.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Lock.hs Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
LockContent.hs correct comment 2016-04-13 13:04:38 -04:00
Log.hs log --raw-date: Use to display seconds from unix epoch. 2016-03-29 14:39:16 -04:00
LookupKey.hs Fix reversion in lookupkey, contentlocation, and examinekey which caused them to sometimes output side messages. 2016-01-29 13:20:24 -04:00
Map.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
MatchExpression.hs matchexpression: Added --largefiles option to parse an annex.largefiles expression. 2016-02-03 16:58:36 -04:00
Merge.hs make sync aware of adjusted branches 2016-02-29 15:23:08 -04:00
MetaData.hs metadata: Added -r to remove all current values of a field. 2016-02-29 13:00:46 -04:00
Migrate.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Mirror.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Move.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
NotifyChanges.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
NumCopies.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
PreCommit.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Proxy.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
ReadPresentKey.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
RecvKey.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
RegisterUrl.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Reinit.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Reinject.hs reinject: Added new mode which can reinject known files into the annex. 2016-04-22 13:49:32 -04:00
ReKey.hs Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
RemoteDaemon.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Repair.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Required.hs started converting to use optparse-applicative 2015-07-08 13:36:25 -04:00
ResolveMerge.hs fix auto merge conflict resolution when doing out of tree merge for adjusted branch 2016-04-06 17:32:04 -04:00
RmUrl.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Schedule.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Semitrust.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
SendKey.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
SetKey.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
SetPresentKey.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Smudge.hs smudge: Print a warning when annex.thin is set, as git's smudge interface does not allow honoring that configuration. 2016-04-13 13:34:24 -04:00
Status.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Sync.hs assistant: Deal with upcoming git's refusal to merge unrelated histories by default 2016-04-22 14:26:44 -04:00
Test.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
TestRemote.hs reinject: When src file's content cannot be verified, leave it alone, instead of deleting it. 2016-04-20 13:21:56 -04:00
TransferInfo.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
TransferKey.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
TransferKeys.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Trust.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Unannex.hs hard links on windows 2016-04-08 15:25:32 -04:00
Undo.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Ungroup.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Uninit.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Unlock.hs Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
Untrust.hs convert all commands to work with optparse-applicative 2015-07-08 15:08:02 -04:00
Unused.hs Correct git-annex info to include unlocked files in v6 repository. 2016-03-14 13:14:01 -04:00
Upgrade.hs autoinit on upgrade 2016-03-31 17:20:43 -04:00
VAdd.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
VCycle.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Version.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
VFilter.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Vicfg.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
View.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
VPop.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Wanted.hs Ord constraint redundant 2016-01-28 12:34:07 -04:00
Watch.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
WebApp.hs webapp: When $HOME is a git repository, and has been initialized for use by git-annex, opening the webapp went ahead and ran the assistant there, annexing all files. Since this is almost certianly not desirable, especially when the user is just opening the webapp from a dekstop menu which happens to run it in $HOME, the webapp will now not treat such a $HOME git repository as a git-annex repository. 2016-04-13 14:07:50 -04:00
Whereis.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
XMPPGit.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00