updating content files
This commit is contained in:
@@ -20,7 +20,7 @@ During an import, depending on the version control system you're importing from,
|
||||
| Move large files to [Git Large File Storage](/articles/about-git-large-file-storage) | **X** | **X** | **X** | |
|
||||
| Remove large files from your repository | **X** | **X** | **X** | |
|
||||
|
||||
### Further reading
|
||||
## Further reading
|
||||
|
||||
- "[Importing a repository with GitHub Importer](/articles/importing-a-repository-with-github-importer)"
|
||||
- "[Updating commit author attribution with GitHub Importer](/articles/updating-commit-author-attribution-with-github-importer)"
|
||||
|
||||
@@ -131,6 +131,6 @@ versions:
|
||||
|
||||
{% endlinux %}
|
||||
|
||||
### Further reading
|
||||
## Further reading
|
||||
|
||||
- "[Adding a file to a repository using the command line](/articles/adding-a-file-to-a-repository-using-the-command-line)"
|
||||
|
||||
@@ -39,6 +39,6 @@ If you'd like to match the commits in your repository to the authors' GitHub use
|
||||
|
||||
You'll receive an email when the repository has been completely imported.
|
||||
|
||||
### Further reading
|
||||
## Further reading
|
||||
|
||||
- "[Updating commit author attribution with GitHub Importer](/articles/updating-commit-author-attribution-with-github-importer)"
|
||||
|
||||
@@ -16,7 +16,7 @@ We recommend using [GitHub Importer](/articles/about-github-importer) to import
|
||||
|
||||
{% endif %}
|
||||
|
||||
### Importing from Subversion
|
||||
## Importing from Subversion
|
||||
|
||||
In a typical Subversion environment, multiple projects are stored in a single root repository. On GitHub, each of these projects will usually map to a separate Git repository for a user account or organization. We suggest importing each part of your Subversion repository to a separate GitHub repository if:
|
||||
|
||||
@@ -28,11 +28,11 @@ We recommend these tools for converting Subversion repositories to Git:
|
||||
- [`git-svn`](https://git-scm.com/docs/git-svn)
|
||||
- [svn2git](https://github.com/nirvdrum/svn2git)
|
||||
|
||||
### Importing from Mercurial
|
||||
## Importing from Mercurial
|
||||
|
||||
We recommend [hg-fast-export](https://github.com/frej/fast-export) for converting Mercurial repositories to Git.
|
||||
|
||||
### Importing from TFVC
|
||||
## Importing from TFVC
|
||||
|
||||
We recommend [git-tfs](https://github.com/git-tfs/git-tfs) for moving changes between TFVC and Git.
|
||||
|
||||
@@ -44,7 +44,7 @@ We recommend [git-tfs](https://github.com/git-tfs/git-tfs) for moving changes be
|
||||
|
||||
{% if currentVersion == "free-pro-team@latest" %}
|
||||
|
||||
### Further reading
|
||||
## Further reading
|
||||
|
||||
- "[About GitHub Importer](/articles/about-github-importer)"
|
||||
- "[Importing a repository with GitHub Importer](/articles/importing-a-repository-with-github-importer)"
|
||||
|
||||
@@ -9,7 +9,7 @@ versions:
|
||||
---
|
||||
GitHub Importer looks for GitHub users whose email addresses match the authors of the commits in the repository you're importing. You can then connect a commit to its author using their email address or the author's GitHub username.
|
||||
|
||||
### Updating commit authors
|
||||
## Updating commit authors
|
||||
|
||||
1. After you've imported your repository, on the import status page, click **Match authors**.
|
||||

|
||||
@@ -17,23 +17,23 @@ GitHub Importer looks for GitHub users whose email addresses match the authors o
|
||||

|
||||
3. Type the email address or GitHub username of the author, then press **Enter**.
|
||||
|
||||
### Attributing commits to a GitHub user with a public email address
|
||||
## Attributing commits to a GitHub user with a public email address
|
||||
|
||||
If the author of a commit in your imported repository has a GitHub account associated with the email address they used to author the commits, and they haven't [set their commit email address as private](/articles/setting-your-commit-email-address), GitHub Importer will match the email address associated with the commit to the public email address associated with their GitHub account, and attribute the commit to their GitHub account.
|
||||
|
||||
### Attributing commits to a GitHub user without a public email address
|
||||
## Attributing commits to a GitHub user without a public email address
|
||||
|
||||
If the author of a commit in your imported repository has neither set a public email address on their GitHub profile, nor [set their commit email address as private](/articles/setting-your-commit-email-address), GitHub Importer may not be able to match the email address associated with the commit with their GitHub account.
|
||||
|
||||
The commit author can resolve this by setting their email address as private. Their commits will then be attributed to `<username>@users.noreply.github.com`, and the imported commits will be associated with their GitHub account.
|
||||
|
||||
### Attributing commits using an email address
|
||||
## Attributing commits using an email address
|
||||
|
||||
If the author's email address is not associated with their GitHub account, they can [add the address to their account](/articles/adding-an-email-address-to-your-github-account) after the import, and the commits will be correctly attributed.
|
||||
|
||||
If the author does not have a GitHub account, GitHub Importer will attribute their commits to the email address associated with the commits.
|
||||
|
||||
### Further reading
|
||||
## Further reading
|
||||
|
||||
- "[About GitHub Importer](/articles/about-github-importer)"
|
||||
- "[Importing a repository with GitHub Importer](/articles/importing-a-repository-with-github-importer)"
|
||||
|
||||
@@ -8,18 +8,18 @@ versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
---
|
||||
### Executable files (svn:executable)
|
||||
## Executable files (svn:executable)
|
||||
|
||||
We convert `svn:executable` properties by updating the file mode directly before adding it to the Git repository.
|
||||
|
||||
### MIME types (svn:mime-type)
|
||||
## MIME types (svn:mime-type)
|
||||
|
||||
{% data variables.product.product_name %} internally tracks the mime-type properties of files and the commits that added them.
|
||||
|
||||
### Ignoring unversioned items (svn:ignore)
|
||||
## Ignoring unversioned items (svn:ignore)
|
||||
|
||||
If you've set files and directories to be ignored in Subversion, {% data variables.product.product_name %} will track them internally. Files ignored by subversion clients are completely distinct from entries in a *.gitignore* file.
|
||||
|
||||
### Currently unsupported properties
|
||||
## Currently unsupported properties
|
||||
|
||||
{% data variables.product.product_name %} doesn't currently support `svn:externals`, `svn:global-ignores`, or any properties not listed above, including custom properties.
|
||||
|
||||
@@ -10,9 +10,9 @@ versions:
|
||||
---
|
||||
GitHub supports Subversion clients via the HTTPS protocol. We use a Subversion bridge to communicate svn commands to GitHub.
|
||||
|
||||
### Supported Subversion features on GitHub
|
||||
## Supported Subversion features on GitHub
|
||||
|
||||
#### Checkout
|
||||
### Checkout
|
||||
|
||||
The first thing you'll want to do is a Subversion checkout. Since Git clones keep the working directory (where you edit files) separate from the repository data, there is only one branch in the working directory at a time.
|
||||
|
||||
@@ -43,7 +43,7 @@ Subversion checkouts are different: they mix the repository data in the working
|
||||
Updated to revision 1.
|
||||
```
|
||||
|
||||
#### Creating branches
|
||||
### Creating branches
|
||||
|
||||
You can also create branches using the Subversion bridge to GitHub.
|
||||
|
||||
@@ -75,7 +75,7 @@ $ git fetch
|
||||
> * [new branch] more_awesome -> origin/more_awesome
|
||||
```
|
||||
|
||||
#### Making commits to Subversion
|
||||
### Making commits to Subversion
|
||||
|
||||
After you've added some features and fixed some bugs, you'll want to commit those
|
||||
changes to GitHub. This works just like the Subversion you're used to. Edit your files, and use `svn commit` to record your changes:
|
||||
@@ -99,7 +99,7 @@ $ svn commit -m 'Test coverage for problems'
|
||||
> Committed revision 4.
|
||||
```
|
||||
|
||||
#### Switching between branches
|
||||
### Switching between branches
|
||||
|
||||
To switch between branches, you'll probably want to start with a checkout of `trunk`:
|
||||
|
||||
@@ -113,7 +113,7 @@ Then, you can switch to another branch:
|
||||
$ svn switch https://github.com/<em>user</em>/<em>repo</em>/branches/more_awesome
|
||||
```
|
||||
|
||||
### Finding the Git commit SHA for a Subversion commit
|
||||
## Finding the Git commit SHA for a Subversion commit
|
||||
|
||||
GitHub's Subversion server exposes the Git commit sha for each Subversion commit.
|
||||
|
||||
@@ -126,6 +126,6 @@ $ svn propget git-commit --revprop -r HEAD https://github.com/<em>user</em>/<em>
|
||||
|
||||
With this commit SHA, you can, for example, look up the corresponding Git commit on GitHub.
|
||||
|
||||
### Further reading
|
||||
## Further reading
|
||||
|
||||
* "[Subversion properties supported by GitHub](/articles/subversion-properties-supported-by-github)"
|
||||
|
||||
@@ -9,7 +9,7 @@ versions:
|
||||
free-pro-team: '*'
|
||||
enterprise-server: '*'
|
||||
---
|
||||
### Directory structure
|
||||
## Directory structure
|
||||
|
||||
Each *reference*, or labeled snapshot of a commit, in a project is organized within specific subdirectories, such as `trunk`, `branches`, and `tags`. For example, an SVN project with two features under development might look like this:
|
||||
|
||||
@@ -41,7 +41,7 @@ A Git workflow looks like this:
|
||||
|
||||
Unlike SVN, with Git the directory structure remains the same, but the contents of the files change based on your branch.
|
||||
|
||||
### Including subprojects
|
||||
## Including subprojects
|
||||
|
||||
A *subproject* is a project that's developed and managed somewhere outside of your main project. You typically import a subproject to add some functionality to your project without needing to maintain the code yourself. Whenever the subproject is updated, you can synchronize it with your project to ensure that everything is up-to-date.
|
||||
|
||||
@@ -49,7 +49,7 @@ In SVN, a subproject is called an *SVN external*. In Git, it's called a *Git sub
|
||||
|
||||
For more information, see “[Git Tools Submodules](https://git-scm.com/book/en/Git-Tools-Submodules)" in the Git documentation.
|
||||
|
||||
### Preserving history
|
||||
## Preserving history
|
||||
|
||||
SVN is configured to assume that the history of a project never changes. Git allows you to modify previous commits and changes using tools like [`git rebase`](/github/getting-started-with-github/about-git-rebase).
|
||||
|
||||
@@ -59,7 +59,7 @@ SVN is configured to assume that the history of a project never changes. Git all
|
||||
|
||||
{% endtip %}
|
||||
|
||||
### Further reading
|
||||
## Further reading
|
||||
|
||||
- "[Subversion properties supported by GitHub](/articles/subversion-properties-supported-by-github)"
|
||||
- ["Branching and Merging" from the _Git SCM_ book](https://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging)
|
||||
|
||||
Reference in New Issue
Block a user