diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:53:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:53:38 -0800 |
| commit | 59a32b07d3e226cad19135aee37bf81c8849efc8 (patch) | |
| tree | 36b60b52ab5a116eed5ea4723dfa5559da7981a2 /gitworkflows.txt | |
| parent | f24d6b5b23d901f1da0026ce4b3f9c1e1b5e09f6 (diff) | |
| download | git-htmldocs-59a32b07d3e226cad19135aee37bf81c8849efc8.tar.gz | |
Autogenerated HTML docs for v2.34.1-182-ge7735
Diffstat (limited to 'gitworkflows.txt')
| -rw-r--r-- | gitworkflows.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitworkflows.txt b/gitworkflows.txt index 47cf97f9b..59305265c 100644 --- a/gitworkflows.txt +++ b/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 |