mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Command
History
Joey Hess 4a847cdc08 finish fixing direct mode merge bug involving unstaged local files 
Added test cases for both ways this can happen, with a conflict involving a
file, or a directory.

Cleaned up resolveMerge to not touch the work tree in direct mode, which
turned out to be the only way to handle things.. And makes it much nicer.

Still need to run test suite on windows.
2014-03-04 02:03:15 -04:00
..
Add.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
AddUnused.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
AddUrl.hs Probe for quvi version at run time. 2014-02-28 14:54:02 -04:00
Assistant.hs assistant --autostart: Refuse to start in a bare git repository. 2014-02-28 19:47:05 -04:00
Commit.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
ConfigList.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Copy.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Dead.hs refactor 2014-02-20 15:12:35 -04:00
Describe.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Direct.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Drop.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
DropKey.hs refactor 2014-01-26 15:53:01 -04:00
DropUnused.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
EnableRemote.hs plumb creds from webapp to initremote 2014-02-11 14:07:56 -04:00
ExamineKey.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Find.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Fix.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Forget.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
FromKey.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Fsck.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
FuzzTest.hs remove dead code 2014-02-08 14:52:25 -04:00
GCryptSetup.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Get.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Group.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Help.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Import.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
ImportFeed.hs Probe for quvi version at run time. 2014-02-28 14:54:02 -04:00
InAnnex.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Indirect.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Info.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
Init.hs reorg 2014-01-26 16:36:31 -04:00
InitRemote.hs plumb creds from webapp to initremote 2014-02-11 14:07:56 -04:00
List.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Lock.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Log.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
LookupKey.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Map.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Merge.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
MetaData.hs metadata: Support --json 2014-02-23 13:58:16 -04:00
Migrate.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Mirror.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Move.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
NumCopies.hs reorg 2014-01-21 18:08:56 -04:00
PreCommit.hs pre-commit-annex hook script to automatically extract metadata from lots of types of files 2014-03-02 20:11:58 -04:00
RecvKey.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Reinject.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
ReKey.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Repair.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
RmUrl.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Schedule.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Semitrust.hs refactor 2014-02-20 15:12:35 -04:00
SendKey.hs reorg 2014-01-26 16:32:55 -04:00
Status.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Sync.hs finish fixing direct mode merge bug involving unstaged local files 2014-03-04 02:03:15 -04:00
Test.hs expose tasty test suite's option parser 2014-01-21 00:08:43 -04:00
TransferInfo.hs reorg 2014-01-26 16:32:55 -04:00
TransferKey.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
TransferKeys.hs reorganize numcopies code (no behavior changes) 2014-01-21 16:08:59 -04:00
Trust.hs trust, untrust, semitrust, dead: Warn when the trust level is overridden in .git/config. 2014-02-20 15:17:39 -04:00
Unannex.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Ungroup.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Uninit.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
Unlock.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
Untrust.hs refactor 2014-02-20 15:12:35 -04:00
Unused.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
Upgrade.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
VAdd.hs view, vfilter: Add support for filtering tags and values out of a view, using !tag and field!=value. 2014-03-02 14:53:19 -04:00
VCycle.hs vadd: Allow listing multiple desired values for a field. 2014-03-02 15:36:45 -04:00
Version.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
VFilter.hs view, vfilter: Add support for filtering tags and values out of a view, using !tag and field!=value. 2014-03-02 14:53:19 -04:00
Vicfg.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
View.hs view: Refuse to enter a view when no branch is currently checked out. 2014-03-02 16:00:56 -04:00
VPop.hs new section for metadata 2014-02-19 14:55:34 -04:00
Wanted.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Watch.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
WebApp.hs annex.listen can be configured, instead of using --listen 2014-03-01 00:31:17 -04:00
Whereis.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
XMPPGit.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00