I decided to give the simpler GIT_DIR approach another go. The reworked Zit ( git://git.oblomov.eu/zit ) works by creating .file.git/ to track file's history. .file.git/info/excludes is initialized to the very strong '*' pattern to ensure that things such as git status etc only consider the actually tracked file. The obvious advantage over the previous implementation is that we don't rely on fragile and non-portable hardlinks. The disadvantage is that something really bad can happen if a command fails to obey GIT_DIR or GIT_WORK_TREE correctly. Command delegation is made a little smarter: zit somecommand file [args...] gets delegated to git somecommand [args...] with GIT_DIR=.file.git and GIT_WORK_TREE="`pwd`", which works surprisingly well. To prevent stupid expressions such as zit add file file or zit commit file file, add and commit put the filename back at the end of the parameter list. Commands that seem to work correctly so far are init, add, log, status, diff, remote, push, pull, and even rebase -i. Commands that definitely need some work are rm (should it just remove the .file.git/ dir?) and mv (hairy: we would need to rename .file.git to .newname.git too, but rollbacks are likely to break things). The only new command introduced by zit is zit list, which lists all zit-tracked files in the current directory, currently in a very braindead way (e.g. I'd like it to display the proper status, such as C M or whatever; suggestions welcome). On the TODO list is also some smart way to guess which file we're talking about when no file is specified. Basically, the idea is to check if there's only one tracked file, or only one changed tracked file, and allow a missing file option in that case. As usual, comments suggestions and critiques welcome. -- Giuseppe "Oblomov" Bilotta -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html