# x, exec = run command (the rest of the line) using shell # f, fixup = like "squash", but discard this commit's log message # s, squash = use commit, but meld into previous commit # e, edit = use commit, but stop for amending # r, reword = use commit, but edit the commit message This will display the editor with a message similar to these contents: pick 73bbc09 Feature implemented Git rebase -i or // You can do it locally or remotely Now here we go with the process: git checkout feature/colors // Is necessary to be in branch of the new feature or ] // dots (.) are importantĪs we can see in previous output, we only have two commits ahead between branches (supossing that branch left is previos command is dev and right branch is new_feature), that ahead changes are in branch of our feature implementation. For this reason, I've found through searching in internet tips and I reached the best solution for this:ġ.- First you have your feature or fix branch with some changes commited, for seeing a cleaner landscape about this we have to run this command: git log -oneline or ]. Sometimes, we have a branch with many commits of a possible new feature or fix, and maybe there's commits that we don't want that commits are shown in main or dev branch. Squash commits, preparing a pull request with a single commit git reset HEAD^ -hard // Or git reset +^ -hardĪfter that we need to force push doing this way: git push -u origin -f
Some tips for Git to Save your Life 👍 Rest branch to spefic commit or last commitįirstly you need select th commit desired or simply reset the HEAD in current branch, (can check if you are in current branch using git branch.
0 kommentar(er)
