| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | assistant direct mode file add/change bookkeeping |  Joey Hess | 2012-12-25 |
| | | | | | | | | | | | | | | | When a file is changed in direct mode, the old content is probably lost (at least from the local repo), and bookeeping needs to be updated to reflect this. Also, synthetic add events are generated at assistant startup, so make it detect when the file has not really changed, and avoid re-adding it. This does add the overhead of querying the runing git cat-file for the key that's recorded in git for the file, each time a file is added or modified in direct mode. | ||
| * | comment | Joey Hess | 2012-12-19 |
| | | |||
| * | normalise associated files | Joey Hess | 2012-12-19 |
| | | | | | | Sometimes ./file will be passed in, and sometimes file; need to treat these the same. | ||
| * | partial and incomplete automatic merging in direct mode | Joey Hess | 2012-12-18 |
| | | | | | Handles our file right, but not theirs. | ||
| * | direct mode merging works! | Joey Hess | 2012-12-18 |
| | | | | | | Automatic merge resoltion code needs to be fixed to preserve objects from direct mode files. | ||
| * | direct mode committing | Joey Hess | 2012-12-12 |
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| summaryrefslogtreecommitdiff |