newdevs:git:commands
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
newdevs:git:commands [2021/05/28 11:47] – tmccanna | newdevs:git:commands [2022/03/24 17:36] – [Vim Text Editor] tmccanna | ||
---|---|---|---|
Line 71: | Line 71: | ||
- Verify that you are in your local branch. | - Verify that you are in your local branch. | ||
- | - Type: git rebase -i origin/ | + | - Type: '' |
+ | * Alternatively if your branch is already built on current master, you can use: '' | ||
- Your text editor will open and should show both of the commits, for example: | - Your text editor will open and should show both of the commits, for example: | ||
* pick 014e59c579 LP#1839359 Select element on login not accessible | * pick 014e59c579 LP#1839359 Select element on login not accessible | ||
Line 79: | Line 80: | ||
* fixup --> merges commits like squash does, but discards previous commit message | * fixup --> merges commits like squash does, but discards previous commit message | ||
- Push the commit again, and force it to overwrite the previous commits: | - Push the commit again, and force it to overwrite the previous commits: | ||
- | * git push --force working lp1839359_login_select: | + | * '' |
Line 117: | Line 118: | ||
* '': | * '': | ||
* '': | * '': | ||
+ | * '': | ||
+ | * ''? | ||
newdevs/git/commands.txt · Last modified: 2024/03/25 16:35 by tmccanna