diff options
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> |