mirror of
https://github.com/Dev-Wiki/git-repo.git
synced 2025-10-15 04:52:40 +08:00
19a83d80854d88f079f8d6530812b50948f0e28c
rebase interactive (aka rebase -i) has changed in newer versions of git, and doesn't always generate the sequence of commits the same way it used to. It also doesn't handle having a previously applied commit try to be applied again. The default rebase algorithm is better suited to our needs. It uses --ignore-if-in-upstream when generating the patch series for git-am, and git-am with its 3-way fallback is able to handle a rename case just as well as the cherry-pick variant used by -m. Its also a generally faster implementation. Signed-off-by: Shawn O. Pearce <sop@google.com>
Description
Languages
Python
99.2%
Shell
0.8%