diff options
| author |  Jean-Noël Avila <jn.avila@free.fr> | 2021-11-06 19:48:55 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-11-09 09:39:11 -0800 |
| commit | 7706294ec94ab9f9b864a8451ac089f15d18a254 (patch) | |
| tree | 469409a77840ff60a54492320ead87da4887a0b4 /Documentation/gitworkflows.txt | |
| parent | doc: use three dots for indicating repetition instead of star (diff) | |
| download | tgif-7706294ec94ab9f9b864a8451ac089f15d18a254.tar.xz | |
doc: uniformize <URL> placeholders' case
URL being an acronym, it deserves to be kept uppercase.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitworkflows.txt')
| -rw-r--r-- | Documentation/gitworkflows.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 47cf97f9be..59305265c5 100644 --- a/Documentation/gitworkflows.txt +++ b/Documentation/gitworkflows.txt @@ -394,7 +394,7 @@ request to do so by mail. Such a request looks like ------------------------------------- Please pull from - <url> <branch> + <URL> <branch> ------------------------------------- In that case, 'git pull' can do the fetch and merge in one go, as @@ -403,7 +403,7 @@ follows. .Push/pull: Merging remote topics [caption="Recipe: "] ===================================== -`git pull <url> <branch>` +`git pull <URL> <branch>` ===================================== Occasionally, the maintainer may get merge conflicts when they try to @@ -440,7 +440,7 @@ merge because you cannot format-patch merges): .format-patch/am: Keeping topics up to date [caption="Recipe: "] ===================================== -`git pull --rebase <url> <branch>` +`git pull --rebase <URL> <branch>` ===================================== You can then fix the conflicts during the rebase. Presumably you have |