Differences

This shows you the differences between two versions of the page.

--- version_control:git_basics [2023/03/01 20:04] – [Clarification] mithat
+++ version_control:git_basics [2023/03/01 20:06] – [Branching and merging] mithat
@@ Line 21: / Line 21: @@
 <WRAP center round tip 90%>
-Use the ''git rm'' and ''git mv'' commands to delete and move/rename files instead of the Windows Explorer, the Finder in macOS, your Linux file manager, or other shell commands. Doing so will simplify staging.
+Use the ''git rm'' and ''git mv'' commands to delete and move/rename files instead of the standard tools in your operating system. Doing so will simplify staging.
 </WRAP>
 ===== Branching and merging =====
-  * A git repository has a default branch called **master**.
+  * A git repository has a default branch called **main**. (In older configurations this may be **master**.)
   * To create a new branch: <code bash>git branch branch-name</code>
   * Switch to an existing branch: <code bash>git checkout branch-name</code>