mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
19a83d8085
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> |
||
|---|---|---|
| docs | ||
| hooks | ||
| subcmds | ||
| .gitignore | ||
| color.py | ||
| command.py | ||
| COPYING | ||
| editor.py | ||
| error.py | ||
| git_command.py | ||
| git_config.py | ||
| main.py | ||
| manifest.py | ||
| pager.py | ||
| progress.py | ||
| project.py | ||
| remote.py | ||
| repo | ||