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

de-emphasize git annex merge

Browse source
This commit is contained in:
Joey Hess 2011-12-26 14:38:55 -04:00
parent 2b97f5381a
commit d74f8db808
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/git-annex.mdwn
View file

@ -220,8 +220,9 @@ subdirectories).
Automatically merges remote tracking branches */git-annex into Automatically merges remote tracking branches */git-annex into
the git-annex branch. While git-annex mostly handles keeping the the git-annex branch. While git-annex mostly handles keeping the
git-annex branch merged automatically, if you find you are unable git-annex branch merged automatically, via the tweak-fetch hook and other
to push the git-annex branch due non-fast-forward, this will fix it. means, if you find you are unable to push the git-annex branch due
non-fast-forward, this will fix it.
* fix [path ...] * fix [path ...]

8
doc/tips/centralised_repository:_starting_from_nothing.mdwn
View file

@ -28,14 +28,6 @@ Clone that to the laptop:
init laptop ok init laptop ok
laptop$ laptop$
Merge the `git-annex` repository (this is the bit that is often
overlooked!):
laptop$ git annex merge
merge . (merging "origin/git-annex" into git-annex...)
ok
laptop$
Add some content: Add some content:
laptop$ git annex addurl http://kitenet.net/~joey/screencasts/git-annex_coding_in_haskell.ogg laptop$ git annex addurl http://kitenet.net/~joey/screencasts/git-annex_coding_in_haskell.ogg