From 51d5c1d032e4b2ec519cd0f3266355105f175941 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 19 Sep 2013 20:13:58 -0400 Subject: [PATCH] remove possibly confusing mention of git commit -a in sync documentation http://git-annex.branchable.com/forum/git-annex_pre-commit_eats_all_my_4GB_of_ram/#comment-f7523e3779794a03680dbf48a488abc0 --- doc/git-annex.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index db8da9ff82..da6f2c1bff 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -128,7 +128,7 @@ subdirectories). the default is to sync with all remotes. Or specify `--fast` to sync with the remotes with the lowest annex-cost value. - The sync process involves first committing all local changes (`git commit -a`), + The sync process involves first committing all local changes then fetching and merging the `synced/master` and the `git-annex` branch from the remote repositories and finally pushing the changes back to those branches on the remote repositories. You can use standard git