CI to automate build of cargo lockfiles on different Alpine releases for git-annex aports https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/git-annex
Find a file
Joey Hess 61a35de433 Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files.
I think this is a git behavior change, but have not checked to be sure.
Conflict cruft used to look like $foo~HEAD, but now just $foo is left
behind as conflict cruft.

With test case.
2014-07-11 16:56:19 -04:00
Annex Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. 2014-07-11 16:56:19 -04:00
Assistant Really fix bug that caused the assistant to make many unncessary empty merge commits. 2014-07-09 15:18:00 -04:00
Backend migrate: Avoid re-checksumming when migrating from hashE to hash backend. 2014-07-10 17:06:04 -04:00
Build typo 2014-07-07 14:30:38 -04:00
CmdLine resolvemerge: New plumbing command that runs the automatic merge conflict resolver. 2014-07-11 16:45:18 -04:00
Command resolvemerge: New plumbing command that runs the automatic merge conflict resolver. 2014-07-11 16:45:18 -04:00
Common
Config
debian Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. 2014-07-11 16:56:19 -04:00
doc resolvemerge: New plumbing command that runs the automatic merge conflict resolver. 2014-07-11 16:45:18 -04:00
Git Fix git version that supported --no-gpg-sign. 2014-07-08 12:46:15 -04:00
Limit
Logs
Messages
Remote S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. 2014-07-11 15:21:43 -04:00
RemoteDaemon
standalone fix logic 2014-07-04 13:58:09 -04:00
static
templates
Types migrate: Avoid re-checksumming when migrating from hashE to hash backend. 2014-07-10 17:06:04 -04:00
Upgrade
Utility refactor 2014-07-10 00:16:53 -04:00
.ghci
.gitattributes
.gitignore
.mailmap
Annex.hs
Assistant.hs
Backend.hs
build.bat
BuildFlags.hs
CHANGELOG
Checks.hs
CmdLine.hs
Command.hs
Common.hs
Config.hs
configure.hs
COPYRIGHT
Creds.hs
Crypto.hs
ghci
git-annex.cabal prep release 2014-07-09 15:28:19 -04:00
git-annex.hs
git-union-merge.hs
Git.hs
INSTALL
Limit.hs
Locations.hs prospective fix for bad_merge_commit_deleting_all_files 2014-07-09 15:08:19 -04:00
Logs.hs
Makefile
Messages.hs
NEWS
README
Remote.hs
Setup.hs
Test.hs Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. 2014-07-11 16:56:19 -04:00
Types.hs
Upgrade.hs

git-annex allows managing files with git, without checking the file
contents into git. While that may seem paradoxical, it is useful when
dealing with files larger than git can currently easily handle, whether due
to limitations in memory, checksumming time, or disk space.

For documentation, see doc/ or <http://git-annex.branchable.com/>