From 9e6ff9e73425e53a8aac884fd97e3ea8f56bc74c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Dec 2011 12:48:59 -0400 Subject: [PATCH] improve wording to not imply a pull is done by merge --- doc/git-annex.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 2d0d2597ea..39fe5d99ea 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -218,10 +218,10 @@ subdirectories). * merge - Automatically merges any changes from remotes into the git-annex branch. - While git-annex mostly handles keeping the git-annex branch merged - automatically, if you find you are unable to push the git-annex branch - due non-fast-forward, this will fix it. + Automatically merges remote tracking branches */git-annex into + the git-annex branch. While git-annex mostly handles keeping the + git-annex branch merged automatically, if you find you are unable + to push the git-annex branch due non-fast-forward, this will fix it. * fix [path ...]