diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-02-25 16:11:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-02-25 16:18:55 -0400 |
| commit | 1f73db3469e29448bcb1520893de11b23da6fb1f (patch) | |
| tree | b16fe0b9552818d16067e7cbb7c3403b73fe5e94 /debian | |
| parent | b49c0c2633d662a7c91a609aec74f95f189129ad (diff) | |
improve alwayscommit=false mode
Now changes are staged into the branch's index, but not committed,
which avoids growing a large journal. And sync and merge always
explicitly commit, ensuring that even when they do nothing else,
they commit the staged changes.
Added a flag file to indicate that the branch's journal contains
uncommitted changes. (Could use git ls-files, but don't want to run
that every time.)
In the future, this ability to have uncommitted changes staged in the
journal might be used on remotes after a series of oneshot commands.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 44cdb3782..bb838ed60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,7 +37,7 @@ git-annex (3.20120124) UNRELEASED; urgency=low a remote's location log. * To avoid commits of data to the git-annex branch after each command is run, set annex.alwayscommit=false. Its data will then be committed - less frequently, when a merge or sync is done. + less frequently, when a merge or sync is done. -- Joey Hess <joeyh@debian.org> Tue, 24 Jan 2012 16:21:55 -0400 |