1
0
mirror of synced 2025-12-22 11:26:57 -05:00

GHEC version (#20947)

Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
Co-authored-by: Grace Park <gracepark@github.com>
Co-authored-by: Steve Guntrip <12534592+stevecat@users.noreply.github.com>
Co-authored-by: Robert Sese <sese@github.com>
Co-authored-by: Peter Bengtsson <peterbe@github.com>
Co-authored-by: Rachael Sewell <rachmari@github.com>
This commit is contained in:
Laura Coursen
2021-10-15 15:41:33 -05:00
committed by GitHub
parent be8cb7cb8c
commit 8f964ea2cb
1592 changed files with 4984 additions and 3494 deletions

View File

@@ -12,6 +12,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
---
Typically, you would use `git rebase` to:

View File

@@ -12,6 +12,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
---
## About subtree merges

View File

@@ -10,6 +10,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
shortTitle: Non-fast-forward error
---
If another person has pushed to the same branch as you, Git won't be able to push your changes:

View File

@@ -5,6 +5,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
shortTitle: Special characters in names
---

View File

@@ -11,6 +11,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
shortTitle: Get changes from a remote
---
## Options for getting changes
@@ -82,5 +83,5 @@ to take the branch back to where it was in before you pulled.
## Further reading
- ["Working with Remotes" from the _Pro Git_ book](https://git-scm.com/book/en/Git-Basics-Working-with-Remotes)"{% ifversion fpt %}
- ["Working with Remotes" from the _Pro Git_ book](https://git-scm.com/book/en/Git-Basics-Working-with-Remotes)"{% ifversion fpt or ghec %}
- "[Troubleshooting connectivity problems](/articles/troubleshooting-connectivity-problems)"{% endif %}

View File

@@ -14,6 +14,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
children:
- /pushing-commits-to-a-remote-repository
- /getting-changes-from-a-remote-repository

View File

@@ -11,6 +11,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
shortTitle: Push commits to a remote
---
## About `git push`

View File

@@ -10,6 +10,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
shortTitle: Resolve conflicts after rebase
---
After you reorder and manipulate commits using `git rebase`, should a merge conflict occur, Git will tell you so with the following message printed to the terminal:

View File

@@ -11,6 +11,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
shortTitle: Splitting a subfolder
---
If you create a new clone of the repository, you won't lose any of your Git history or changes when you split a folder into a separate repository.
@@ -47,7 +48,7 @@ If you create a new clone of the repository, you won't lose any of your Git hist
The repository should now only contain the files that were in your subfolder(s).
6. [Create a new repository](/articles/creating-a-new-repository/) on {% data variables.product.product_name %}.
7. At the top of your new {% data variables.product.product_name %} repository's Quick Setup page, click {% octicon "clippy" aria-label="The copy to clipboard icon" %} to copy the remote repository URL.
7. At the top of your new repository on {% ifversion ghae %}{% data variables.product.product_name %}{% else %}{% data variables.product.product_location %}{% endif %}'s Quick Setup page, click {% octicon "clippy" aria-label="The copy to clipboard icon" %} to copy the remote repository URL.
![Copy remote repository URL field](/assets/images/help/repository/copy-remote-repository-url-quick-setup.png)
{% tip %}

View File

@@ -11,6 +11,7 @@ versions:
fpt: '*'
ghes: '*'
ghae: '*'
ghec: '*'
shortTitle: Git rebase
---
## Using Git rebase