If a commit was marked with s for squash, another viewer will pop-up to ask you to provide the commit message and subject line. To squash your latest commits ,if you want to last 10 commits. open up a terminal and cd to your clones directory, checkout the branch you wish to. git will run through the file from top to bottom and pause when required to allow you to make the changes you have requested. You may also move lines up or down to re-order the commits add or take away changes)ĭ will remove the commit, alternatively you can just delete the line from the viewer First you mark it with r and later git will pop up another view to allow you to modify the subject and descriptionĮ for edit allows you to modify what is in the commit (i.e. Note that you cannot simply modify the subject line in the viewer. R for reword allows you to change the subject and description of the commit. From man git-merge (or git help merge ): git-merge - Join two or more development histories together The result will be a commit with more than two parents when you do that. In the example above “AP_HAL_F4Light: fixed some support scripts” and “AP_HAL_F4LIGHT: small fix (NFC)” will be “squashed” together into a single commit 3 Answers Sorted by: 63 You can use git merge to merge more than one commit into your current branch. S for squash will combine the commit with the previous commit. In the terminal that pops up (see top image on this page) find the commits you wish to modify and replace their pick with one of the following letters:
0 kommentar(er)
