diff options
| author | Jim Meyering <jim@meyering.net> | 2012-03-28 10:41:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-28 08:47:23 -0700 |
| commit | a7793a749115ead3b8f7447ce1e96572ea5d8ea3 (patch) | |
| tree | b25c8f7aca546e7113e694a23318db546799bd68 /Documentation/howto | |
| parent | 59012e20f8461e51d9f7de1c6ebf05ee7a46b2c2 (diff) | |
| download | git-a7793a749115ead3b8f7447ce1e96572ea5d8ea3.tar.gz | |
correct spelling: an URL -> a URL
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto')
| -rw-r--r-- | Documentation/howto/using-merge-subtree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt index 2933056120..1ae8d1214e 100644 --- a/Documentation/howto/using-merge-subtree.txt +++ b/Documentation/howto/using-merge-subtree.txt @@ -25,7 +25,7 @@ What you want is the 'subtree' merge strategy, which helps you in such a situation. In this example, let's say you have the repository at `/path/to/B` (but -it can be an URL as well, if you want). You want to merge the 'master' +it can be a URL as well, if you want). You want to merge the 'master' branch of that repository to the `dir-B` subdirectory in your current branch. |