summaryrefslogtreecommitdiff
path: root/Git/Index.hs
Commit message (Collapse)AuthorAge
* avoid bad commits after interrupted direct mode sync (or merge)Gravatar Joey Hess2014-06-09
| | | | | | | | | | | | | | | It was possible for a interrupted sync or merge in direct mode to leave the work tree out of sync with the last recorded commit. This would result in the next commit seeing files missing from the work tree, and committing their removal. Now, a direct mode merge happens not only in a throwaway work tree, but using a temporary index file, and without any commits or index changes being made until the real work tree has been updated. If the merge is interrupted, the work tree may have some updated files, but worst case a commit will redundantly commit changes that come from the merge. This commit was sponsored by Tony Cantor.
* merge improved fsck types from git-repair and some associated changesGravatar Joey Hess2013-11-30
|
* clean up from windows portingGravatar Joey Hess2013-05-11
|
* finished where indentation changesGravatar Joey Hess2012-12-13
|
* thread safe git-annex index file useGravatar Joey Hess2012-08-24
|
* Add --include, which is the same as --not --exclude.Gravatar Joey Hess2011-12-22
|
* use Common in a few more modulesGravatar Joey Hess2011-12-20
|
* split more stuff out of Git.hsGravatar Joey Hess2011-12-14