diff options
author | Waldir Pimenta <waldyrious@gmail.com> | 2021-04-14 11:14:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-14 11:14:09 +0100 |
commit | ccdf91a7576fd907e29e892a3eb7bdce4b7b2508 (patch) | |
tree | 951771bbd687969a5f6b4cbed08abcff1f2742c2 /README.md | |
parent | 4838e378b94f2731f1d53042a71136dcb4890c44 (diff) |
README: clarify alternative command
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -11,7 +11,7 @@ You have a feature branch with a few commits. Your teammate reviewed the branch ``` git add $FILES_YOU_FIXED git absorb --and-rebase -# or: git rebase -i --autosquash master +# or: git absorb && git rebase -i --autosquash master ``` `git absorb` will automatically identify which commits are safe to modify, and which indexed changes belong to each of those commits. It will then write `fixup!` commits for each of those changes. You can check its output manually if you don't trust it, and then fold the fixups into your feature branch with git's built-in autosquash functionality. |