Skip to content

Commit

Permalink
Clarify suggestions to avoid unwanted file commits and unnecessary diffs
Browse files Browse the repository at this point in the history
  • Loading branch information
egrace479 committed Nov 20, 2024
1 parent 4390a61 commit 0d7ffe2
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion docs/wiki-guide/Command-Line-Cheat-Sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ See also [GitHub's Markdown Guide](https://docs.github.com/en/get-started/writin
| `git branch -d <branch>` | delete branch |

!!! tip "Pro tip: Simplify your git history"
- Use `git mv` to rename a file so that it is tracked as a rename (with or without changes). - If you rename a file then use `git add .` or similar, the diff will show the deletion of the original file and addition of a "completely new" file, even if nothing has changed. This makes reviewing changes much more complicated than necessary.
- Use `git mv` to rename a file so that it is tracked as a rename (with or without changes).
- If you rename a file then `git add` its parent directory, the diff will show the deletion of the original file and addition of a "completely new" file, even if nothing has changed. This makes reviewing changes much more complicated than necessary.

#### Usual Process
After making changes to a file on a branch, check the status of your current working branch (with `git status`). Then, you "add" the file, state what is new about the file ("commit the change"), and `push` the file from your local copy of the repo to the remote copy:
Expand All @@ -44,6 +45,9 @@ git push

```

!!! tip "Pro tip: Check the stage"
After using `git add <folder>` or `git add <regex>` (a pattern match), run `git status` to ensure that all intended files--and ***only*** intended files--are staged for commit.

!!! note Note
If you need to update your branch with changes from the remote `main`, first switch to the branch, then set pull from `main` instead of the current branch, as below.
```bash
Expand Down

0 comments on commit 0d7ffe2

Please sign in to comment.