summaryrefslogtreecommitdiffstats
path: root/color.py
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2009-04-16 08:14:26 -0700
committerShawn O. Pearce <sop@google.com>2009-04-16 08:23:29 -0700
commit19a83d80854d88f079f8d6530812b50948f0e28c (patch)
tree2ca943f3833963b4d34d1a675dc9f6ed2f1bd201 /color.py
parentb1168ffadaff387a8b7ab9a9c861073035c505a8 (diff)
downloadgit-repo-19a83d80854d88f079f8d6530812b50948f0e28c.tar.gz
Use default rebase during sync instead of rebase -i
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>
Diffstat (limited to 'color.py')
0 files changed, 0 insertions, 0 deletions