diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-25 11:39:15 -0700 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-25 11:39:15 -0700 |
| commit | e2853b3fec1c34bd420b9e1753be4aa1afeb675e (patch) | |
| tree | 0f01691f4ab05b5e5a7b2a6a3574e022bd56d7a2 | |
| parent | 962fed915ff2b4c652a879c4b7a01086c680c6e0 (diff) | |
update
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/todo/smudge.mdwn | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4e0a1e21e..0ebda22dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ git-annex (3.20111012) UNRELEASED; urgency=low * migrate: Copy url logs for keys when migrating. * git-annex-shell: GIT_ANNEX_SHELL_READONLY and GIT_ANNEX_SHELL_LIMITED environment variables can be set to limit what commands can be run. - This could be used by eg, gitolite. + This is used by gitolite's new git-annex support! -- Joey Hess <joeyh@debian.org> Fri, 14 Oct 2011 18:15:20 -0400 diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn index 55de5f578..6103ffa61 100644 --- a/doc/todo/smudge.mdwn +++ b/doc/todo/smudge.mdwn @@ -11,6 +11,10 @@ version of the file during a merge. So every `git status` would need to read the entire content of all available files, and checksum them, which is too expensive. +> Update from GitTogether: Peff thinks a new interface could be added to +> git to handle this sort of case in an efficient way.. just needs someone +> to do the work. --[[Joey]] + ---- The clean filter is run when files are staged for commit. So a user could copy |