zegonix/collection
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
scbj
2025-03-28 12:01:45 +01:00
parent a9b55646d8
commit 1c647e6d87
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git.md
View File

@@ -92,11 +92,21 @@ git merge --continue
When following the philosophie of rebasing, one rebases the feature branch onto the target branch. This is done with When following the philosophie of rebasing, one rebases the feature branch onto the target branch. This is done with
```sh ```sh
# rebases current branch onto 'target-branch' # rebase to (newest commit of) a branch
git rebase <target-branch> git rebase <target-branch>
# or rebase to a specific commit
git rebase <commit-hash>
# proceeds after solving rebase conflict # proceeds after solving rebase conflict
git rebase --continue git rebase --continue
``` ```
This is only necessary, if the 'main' branch progressed in the mean time, otherwise one just merges the feature branch into the 'main' branch. This is only necessary, if the 'main' branch progressed in the mean time, otherwise one just merges the feature branch into the 'main' branch.
## squash
"Squashing" commits (combining several commits into one commit) is done with an interactive rebase (`git rebase -i`).
Replace the `pick` with `squash` or just `s` for all commits to be combined.
Afterwards a force push is needed (`git push --force-with-lease`)