| Commit message (Expand) | Author | Age |
|---|
| * | remove some monkey faces |  Joey Hess | 2014-02-01 |
| * | sync --content: Re-pull from remotes after downloading content, since that ca... | Joey Hess | 2014-02-01 |
| * | improve sync with xmpp and annex-ignore | Joey Hess | 2014-02-01 |
| * | avoid using function named that conflicts with name used in newer version of ... | Joey Hess | 2014-01-29 |
| * | reorganize some files and imports | Joey Hess | 2014-01-26 |
| * | fix transfers of key with no associated file | Joey Hess | 2014-01-23 |
| * | much better command action handling for sync --content | Joey Hess | 2014-01-20 |
| * | fix inversion of control in CommandSeek (no behavior changes) | Joey Hess | 2014-01-20 |
| * | include information about remotes just uloaded to when calling handleDropsFrom | Joey Hess | 2014-01-19 |
| * | sync --content: New option that makes the content of annexed files be transfe... | Joey Hess | 2014-01-19 |
| * | Remotes can now be made read-only, by setting remote.<name>.annex-readonly | Joey Hess | 2014-01-02 |
| * | Avoid using git commit in direct mode, since in some situations it will read ... | Joey Hess | 2013-12-01 |
| * | on second thought, don't change sync to exit nonzero on successful conflicted... | Joey Hess | 2013-11-14 |
| * | add a note after successful conflicted merge resolution | Joey Hess | 2013-11-14 |
| * | sync: When there are merge conflicts that get automatically resolved, exit no... | Joey Hess | 2013-11-07 |
| * | work around lack of receive.denyCurrentBranch in direct mode | Joey Hess | 2013-11-05 |
| * | sync: Work even when the local git repository is new and empty, with no maste... | Joey Hess | 2013-11-02 |
| * | use a long note here | Joey Hess | 2013-11-01 |
| * | sync: print a hint about receive.denyNonFastForwards when a push fails | Joey Hess | 2013-10-26 |
| * | sync: fix crash on first sync when no branch exists yet | Joey Hess | 2013-10-17 |
| * | fix indirect mode conflict merge when only one side is annexed file | Joey Hess | 2013-10-16 |
| * | sync: Fix automatic resolution of merge conflicts where one side is an annexe... | Joey Hess | 2013-10-16 |
| * | hlint | Joey Hess | 2013-09-25 |
| * | more completely solve catKey memory leak | Joey Hess | 2013-09-19 |
| * | sync: Don't fail if the directory it is run in gets removed by the sync. | Joey Hess | 2013-09-13 |
| * | sync: support gcrypt4.20130909 | Joey Hess | 2013-09-09 |
| * | sync, assistant: Force push of the git-annex branch. | Joey Hess | 2013-08-29 |
| * | sync, merge: Bug fix: Don't try to merge into master when in a bare repo. | Joey Hess | 2013-08-17 |
| * | sync: Better support for bare git remotes. Now pushes directly to the master ... | Joey Hess | 2013-06-12 |
| * | fix merge conflict resolution when both sides have the same key | Joey Hess | 2013-05-26 |
| * | correct recent fix | Joey Hess | 2013-05-26 |
| * | sync: Fix double merge conflict resolution handling. | Joey Hess | 2013-05-26 |
| * | fuzz test discovered a way automatic merge resultion can fail; fix | Joey Hess | 2013-05-25 |
| * | sync: Commit in direct mode even if no changes were staged | Joey Hess | 2013-04-23 |
| * | sync, assistant: Sync with remotes that have annex-ignore set | Joey Hess | 2013-04-22 |
| * | Use lower case hash directories for storing files on crippled filesystems, sa... | Joey Hess | 2013-04-04 |
| * | add section metadata to all commands | Joey Hess | 2013-03-24 |
| * | git subcommand cleanup | Joey Hess | 2013-03-03 |
| * | fully support core.symlinks=false in all relevant symlink handling code | Joey Hess | 2013-02-17 |
| * | avoid queueing rm of no files | Joey Hess | 2013-02-05 |
| * | sync: Automatic merge conflict resolution now stages deleted files. | Joey Hess | 2013-01-17 |
| * | type based git config handling for remotes | Joey Hess | 2013-01-01 |
| * | use sync command merge engine in assistant | Joey Hess | 2012-12-25 |
| * | more quickcheck fun | Joey Hess | 2012-12-19 |
| * | partial and incomplete automatic merging in direct mode | Joey Hess | 2012-12-18 |
| * | direct mode merging works! | Joey Hess | 2012-12-18 |
| * | reorder for better display | Joey Hess | 2012-12-13 |
| * | direct mode committing | Joey Hess | 2012-12-12 |
| * | also update direct mode associated files in local merge | Joey Hess | 2012-12-12 |
| * | direct mode mappings now updated by git annex sync | Joey Hess | 2012-12-10 |
Joey Hess