diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-23 12:48:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-23 12:49:28 -0400 |
| commit | 9e6ff9e73425e53a8aac884fd97e3ea8f56bc74c (patch) | |
| tree | 45e32db4482a13ea2b5c4ea7eb34d33a6773eed6 /doc/git-annex.mdwn | |
| parent | 0df51acc529c7dfc5beae7e6031d00a6064c64a0 (diff) | |
improve wording to not imply a pull is done by merge
Diffstat (limited to 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 2d0d2597e..39fe5d99e 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 ...] |