index
:
git-annex-gpl
master
git-annex without the AGPL
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Command
/
Sync.hs
Commit message (
Expand
)
Author
Age
*
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 gcrypt
4.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
*
where indentation
Joey Hess
2012-11-12
*
git config remote.name.annex-sync can be used to control whether a remote get...
Joey Hess
2012-10-11
*
fix last zombies in the assistant
Joey Hess
2012-10-04
*
sync: Pushes the git-annex branch to remote/synced/git-annex, rather than dir...
Joey Hess
2012-09-16
*
add decodeW8
Joey Hess
2012-09-13
*
refactor
Joey Hess
2012-08-26
*
refactor
Joey Hess
2012-08-26
*
avoid unnecessary transfer scans when syncing a disconnected remote
Joey Hess
2012-08-22
*
add routes to pause/start/cancel transfers
Joey Hess
2012-08-08
*
handle case of adding populated drive to just created repo
Joey Hess
2012-08-05
*
fix crashes when run in a git repo that has been initted but has no master br...
Joey Hess
2012-08-05
*
Merge branch 'master' into assistant
Joey Hess
2012-06-27
|
\
|
*
typo
Joey Hess
2012-06-27
*
|
Merge branch 'master' into assistant
Joey Hess
2012-06-27
|
\
|
|
*
use "variant" rather than "version"
Joey Hess
2012-06-27
|
*
better filenames for conflict resolution files
Joey Hess
2012-06-27
|
*
commit merge resolution
Joey Hess
2012-06-27
|
*
fix file name
Joey Hess
2012-06-27
|
*
don't automerge when the symlinks cannot be parsed as keys
Joey Hess
2012-06-27
[next]