jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-21 02:46:50 -05:00
Code Issues Projects Releases Wiki Activity

Document features and changes for phase 2.5 of master/main transition (#15745)

Browse Source
This commit is contained in:
Matt Pollard
2020-10-02 01:43:01 +02:00
committed by GitHub
parent 16dd6b4654
commit aa3a4edb62
80 changed files with 206 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.md
View File

@@ -49,7 +49,7 @@ versions:
```
9. [Push the changes](/articles/pushing-commits-to-a-remote-repository/) in your local repository to {% data variables.product.product_location %}.
```shell
$ git push -u origin master
$ git push -u origin main
# Pushes the changes in your local repository up to the remote repository you specified as the origin
```

2
content/github/importing-your-projects-to-github/support-for-subversion-clients.md
View File

@@ -47,7 +47,7 @@ Subversion checkouts are different: they mix the repository data in the working
You can also create branches using the Subversion bridge to GitHub.
From your svn client, make sure "master" is current by updating `trunk`:
From your svn client, make sure the default branch is current by updating `trunk`:
```shell
$ svn up trunk
> At revision 1.

4
content/github/importing-your-projects-to-github/what-are-the-differences-between-subversion-and-git.md
View File

@@ -35,9 +35,9 @@ Git projects are also stored within a single directory. However, Git obscures th
A Git workflow looks like this:
* A Git repository stores the full history of all of its branches and tags within the *.git* directory.
* The latest stable release is contained within the `master` branch.
* The latest stable release is contained within the default branch.
* Active feature work is developed in separate branches.
* When a feature is finished, the feature branch is merged into `master` and deleted.
* When a feature is finished, the feature branch is merged into the default branch and deleted.
Unlike SVN, with Git the directory structure remains the same, but the contents of the files change based on your branch.