mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
a54c527ae9
Instead of trying to rebase the changes on a topic branch that has been fully merged into the upstream branch we track, we should just fast-forward the topic branch to the new upstream revision. This way the branch doesn't try to rewrite commits that are already merged in the upstream. Signed-off-by: Shawn O. Pearce <sop@google.com> |
||
|---|---|---|
| codereview | ||
| froofle | ||
| subcmds | ||
| .gitignore | ||
| color.py | ||
| command.py | ||
| COPYING | ||
| editor.py | ||
| error.py | ||
| gerrit_upload.py | ||
| git_command.py | ||
| git_config.py | ||
| main.py | ||
| Makefile | ||
| manifest.py | ||
| pager.py | ||
| project.py | ||
| remote.py | ||
| repo | ||