yade-dev team mailing list archive

Thread
Date

[Branch ~yade-pkg/yade/git-trunk] Rev 4184: fix long line in github doc

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 08 Oct 2014 10:02:23 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 4184
committer: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
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"::