------------------------------------------------------------
revno: 4184
committer: Christian Jakob <[email protected]>
timestamp: Wed 2014-10-08 07:24:38 +0200
message:
fix long line in github doc
modified:
doc/sphinx/github.rst
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to
https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'doc/sphinx/github.rst'
--- doc/sphinx/github.rst 2014-08-18 15:34:10 +0000
+++ doc/sphinx/github.rst 2014-10-08 05:24:38 +0000
@@ -150,7 +150,9 @@
[branch "master"]
remote = origin
+
merge = refs/heads/master
+
rebase = true
Auto-rebase may have unpleasant side effects by blocking "pull" if you have uncommited changes. In this case you can use "git stash"::
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
