diff options
-rw-r--r-- | git.html.markdown | 5 | ||||
-rw-r--r-- | python.html.markdown | 2 | ||||
-rw-r--r-- | scala.html.markdown | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/git.html.markdown b/git.html.markdown index 00f38d60..d8537300 100644 --- a/git.html.markdown +++ b/git.html.markdown @@ -310,7 +310,12 @@ Pulls from a repository and merges it with another branch. # Update your local repo, by merging in new changes # from the remote "origin" and "master" branch. # git pull <remote> <branch> +# git pull => implicitly defaults to => git pull origin master $ git pull origin master + +# Merge in changes from remote branch and rebase +# branch commits onto your local repo, like: "git pull <remote> <branch>, git rebase <branch>" +$ git pull origin master --rebase ``` ### push diff --git a/python.html.markdown b/python.html.markdown index a32db51a..f0b74d08 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -6,7 +6,7 @@ filename: learnpython.py --- Python was created by Guido Van Rossum in the early 90's. It is now one of the most popular -languages in existence. I fell in love with Python for its syntactic clarity. Its basically +languages in existence. I fell in love with Python for its syntactic clarity. It's basically executable pseudocode. Feedback would be highly appreciated! You can reach me at [@louiedinh](http://twitter.com/louiedinh) or louiedinh [at] [google's email service] diff --git a/scala.html.markdown b/scala.html.markdown index fef09404..b1b3ecbf 100644 --- a/scala.html.markdown +++ b/scala.html.markdown @@ -408,9 +408,11 @@ for(line <- Source.fromPath("myfile.txt").getLines()) [Scala for the impatient](http://horstmann.com/scala/) -[Twitter Scala school(http://twitter.github.io/scala_school/) +[Twitter Scala school](http://twitter.github.io/scala_school/) -[The scala documentation] +[The scala documentation](http://docs.scala-lang.org/) + +[Try Scala in your browser](http://scalatutorials.com/tour/) Join the [Scala user group](https://groups.google.com/forum/#!forum/scala-user) |