diff options
| author | tekkub <tekkub@gmail.com> | 2009-11-27 16:09:11 -0700 |
|---|---|---|
| committer | tekkub <tekkub@gmail.com> | 2009-11-27 16:09:11 -0700 |
| commit | c38b925777a250d6cc7015b2128b701abcb7a27e (patch) | |
| tree | 335bd243140a87490b1520f9dde5393758b57f93 /_posts/2009-10-10-subtree-merge.textile | |
| parent | 996d753d0c0242b0b6fb346683a8351d9b46c57b (diff) | |
| parent | 00f4345523917716a49f946d807d62e3f0966e06 (diff) | |
Merge branch 'master' of git://github.com/joachim-n/help.github.com
Diffstat (limited to '_posts/2009-10-10-subtree-merge.textile')
| -rw-r--r-- | _posts/2009-10-10-subtree-merge.textile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_posts/2009-10-10-subtree-merge.textile b/_posts/2009-10-10-subtree-merge.textile index cd50b06..ab4fddc 100644 --- a/_posts/2009-10-10-subtree-merge.textile +++ b/_posts/2009-10-10-subtree-merge.textile @@ -65,7 +65,7 @@ Automatic merge went well; stopped before committing as requested h2. Pulling in changes -If the merged repo changes in the future, you can pull in it's changes by simply using the @-s subtree@ flag: +If the merged repo changes in the future, you can pull in its changes by simply using the @-s subtree@ flag: <pre class="terminal">[tekkub@tekBook: ~/tmp/test master] $ git pull -s subtree panda master</pre> |