aboutsummaryrefslogtreecommitdiff
path: root/Annex
Commit message (Expand)AuthorAge
* fix windows buildGravatar Joey Hess2014-07-14
* resolvemerge: finish up by committingGravatar Joey Hess2014-07-11
* Deal with change in git 2.0 that made indirect mode merge conflict resolution...Gravatar Joey Hess2014-07-11
* resolvemerge: New plumbing command that runs the automatic merge conflict res...Gravatar Joey Hess2014-07-11
* direct: Fix handling of case where a work tree subdirectory cannot be written...Gravatar Joey Hess2014-07-10
* refactor lockingGravatar Joey Hess2014-07-10
* refactorGravatar Joey Hess2014-07-10
* Fix minor FD leak in journal code.Gravatar Joey Hess2014-07-09
* fix build warning5.20140709Gravatar Joey Hess2014-07-09
* fix windows buildGravatar Joey Hess2014-07-09
* prospective fix for bad_merge_commit_deleting_all_filesGravatar Joey Hess2014-07-09
* Fix bug in automatic merge conflict resolutionGravatar Joey Hess2014-07-08
* assistant: Fix bug, introduced in last release, that caused the assistant to ...Gravatar Joey Hess2014-07-05
* work around getDirectoryContents not streaming lazilyGravatar Joey Hess2014-07-04
* Fix memory leak when committing millions of changes to the git-annex branchGravatar Joey Hess2014-07-04
* support commit.gpgsignGravatar Joey Hess2014-07-04
* really add non-date metadata tooGravatar Joey Hess2014-07-03
* import metadata from feedsGravatar Joey Hess2014-07-03
* refactorGravatar Joey Hess2014-06-16
* work around a bug in gitGravatar Joey Hess2014-06-12
* finish fixing windows timezone madnessGravatar Joey Hess2014-06-12
* fix for Windows file timestamp timezone madnessGravatar Joey Hess2014-06-12
* export CreateProcess fields from Utility.ProcessGravatar Joey Hess2014-06-10
* simplifyGravatar Joey Hess2014-06-09
* avoid fast-forwarding when a merge conflict was auto-resolvedGravatar Joey Hess2014-06-09
* avoid bad commits after interrupted direct mode sync (or merge)Gravatar Joey Hess2014-06-09
* fixed getting files from bare repos on windowsGravatar Joey Hess2014-06-05
* wipGravatar Joey Hess2014-06-05
* Windows: Fix bug introduced in last release that caused files in the git-anne...Gravatar Joey Hess2014-06-05
* webapp: When adding a new local repository, fix bug that caused its group and...Gravatar Joey Hess2014-05-29
* Use exceptions in place of deprecated MonadCatchIO-transformersGravatar Ben Gamari2014-05-28
* Fix encoding of data written to git-annex branch. Avoid truncating unicode ch...Gravatar Joey Hess2014-05-27
* support being run by ssh as ssh-askpass replacementGravatar Joey Hess2014-04-29
* use a subdir of GIT_ANNEX_TMP for ssh connection caching socketsGravatar Joey Hess2014-04-20
* When init detects that git is not configured to commit, and sets user.email t...Gravatar Joey Hess2014-04-20
* replace (Key, Backend) with KeyGravatar Joey Hess2014-04-17
* reinit: New command that can initialize a new reposotory using the configurat...Gravatar Joey Hess2014-04-15
* Merge branch 'master' into remotecontrolGravatar Joey Hess2014-04-14
|\
| * add missing Network.URI Ord instance for Debian stableGravatar Joey Hess2014-04-14
* | don't try to use ssh connection caching for non-ssh urlsGravatar Joey Hess2014-04-13
* | remotedaemon: When network connection is lost, close all cached ssh connections.Gravatar Joey Hess2014-04-12
* | sync, assistant, remotedaemon: Use ssh connection caching for git pushes and ...Gravatar Joey Hess2014-04-12
|/
* Notification: Add action/status-dependent icon and urgencyGravatar Johan Kiviniemi2014-04-05
* Notification: summary is not optionalGravatar Johan Kiviniemi2014-04-05
* fix warning on !dbusGravatar Joey Hess2014-04-02
* reorg matcher types; no non-type code changesGravatar Joey Hess2014-03-29
* forget --drop-dead: Avoid removing the dead remote from the trust.log, so tha...Gravatar Joey Hess2014-03-26
* fix build w/o DesktopNotificationGravatar Joey Hess2014-03-23
* notifications on dropGravatar Joey Hess2014-03-22
* fix failure notificationGravatar Joey Hess2014-03-22