mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve wording to not imply a pull is done by merge

Browse source
This commit is contained in:
Joey Hess 2011-12-23 12:48:59 -04:00
parent 0df51acc52
commit 9e6ff9e734
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/git-annex.mdwn
View file

@ -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 ...]