Add git tips #669
Open
Add git tips #669
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TraceyC77
added
the
hacktoberfest-accepted
EbonJaeger
requested changes
Oct 24, 2025
Member
EbonJaeger
left a comment
EbonJaeger
left a comment
There was a problem hiding this comment.
We should probably add "worktree" and "worktrees" to the allowed words list, too, so the spellchecker stops complaining.
| ## Use worktrees to make switching between branches easier | ||
|
|
||
| It's possible to create a worktree to make working with things like stack updates easier. | ||
| If you need to switch focus, you can switch to a different folder with a different worktree (like main). |
Member
There was a problem hiding this comment.
Suggested change
| If you need to switch focus, you can switch to a different folder with a different worktree (like main). | |
| If you need to switch focus, you can switch to a different folder with a different worktree (like `main`). |
|
|
||
| ## Splitting a commit during `rebase -i` | ||
|
|
||
| There may be times when you're in the middle of an interactive rebase where you want to split a commit. To do this, start by running |
Member
There was a problem hiding this comment.
Suggested change
| There may be times when you're in the middle of an interactive rebase where you want to split a commit. To do this, start by running | |
| There may be times when you're in the middle of an interactive rebase and you want to split a commit. To do this, start by running: |
| git rebase -i origin/HEAD --autostash | ||
| ``` | ||
|
|
||
| Then, find the needed commit and change pick to e (short for edit), save and exit. |
Member
There was a problem hiding this comment.
Suggested change
| Then, find the needed commit and change pick to e (short for edit), save and exit. | |
| Then, find the needed commit and change "pick" to "e" (short for edit), save and exit. |
I'm not entirely sure if those should be quoted, or code text (like pick and e).
| ``` | ||
|
|
||
| Then, find the needed commit and change pick to e (short for edit), save and exit. | ||
| Then run |
Member
There was a problem hiding this comment.
Suggested change
| Then run | |
| Then run: |
| git reset HEAD~ | ||
| ``` | ||
|
|
||
| If you run `git status` you can see the changes are unstaged. |
Member
There was a problem hiding this comment.
Suggested change
| If you run `git status` you can see the changes are unstaged. | |
| If you run `git status`, you will see the changes are unstaged. |
| ``` | ||
|
|
||
| If you run `git status` you can see the changes are unstaged. | ||
| Then `gotopkg your-package` and run `git add` and `git commit` as normal. |
Member
There was a problem hiding this comment.
Suggested change
| Then `gotopkg your-package` and run `git add` and `git commit` as normal. | |
| Then, change to the package directory you want with `gotopkg your-package`, and run `git add` and `git commit` as normal. |
| If you run `git status` you can see the changes are unstaged. | ||
| Then `gotopkg your-package` and run `git add` and `git commit` as normal. | ||
| Do the same for the second split. | ||
| Then run |
Member
There was a problem hiding this comment.
Suggested change
| Then run | |
| When you are finished, complete the rebase and push the branch. |
Member
There was a problem hiding this comment.
I think both this line and the previous one should also either be on the same line, or have a blank line added between them.
github-project-automation
bot
moved this from Backlog
to Under Review
in Web and Documentation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Add using worktreses and how to split
a commit during interactive rebase
Fixes #570
Fixes #571