version_control:git_basics
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| version_control:git_basics [2023/03/01 20:05] – [Basic operations] mithat | version_control:git_basics [2024/04/17 21:53] (current) – [Branching and merging] mithat | ||
|---|---|---|---|
| Line 25: | Line 25: | ||
| ===== Branching and merging ===== | ===== Branching and merging ===== | ||
| - | * A git repository has a default branch called **master**. | + | * A git repository has a default branch called |
| * To create a new branch: <code bash>git branch branch-name</ | * To create a new branch: <code bash>git branch branch-name</ | ||
| * Switch to an existing branch: <code bash>git checkout branch-name</ | * Switch to an existing branch: <code bash>git checkout branch-name</ | ||
| Line 31: | Line 31: | ||
| * Merge changes in another branch into the current branch: <code bash>git merge branch-name</ | * Merge changes in another branch into the current branch: <code bash>git merge branch-name</ | ||
| * Delete a branch that you're not currently in: <code bash>git branch -d branch-name</ | * Delete a branch that you're not currently in: <code bash>git branch -d branch-name</ | ||
| + | |||
| + | <WRAP center round tip 90%> | ||
| + | The new '' | ||
| + | </ | ||
| ===== Ignoring files ===== | ===== Ignoring files ===== | ||
| * To make git ignore some files in your project, create a '' | * To make git ignore some files in your project, create a '' | ||
| # Ignore specific files | # Ignore specific files | ||
| - | nastyfile.txt | + | my-passwords.txt |
| - | another-nastyfile.docx | + | banking-info.docx |
| # Ignore compiled file(s) | # Ignore compiled file(s) | ||
version_control/git_basics.1677701127.txt.gz · Last modified: 2023/03/01 20:05 by mithat