Victor Vianna
|
9a6aa08468
Suggest --no-fetch flag after git rebase-update conflict
|
2 years ago |
Chloe Pelling
|
e515e5d22e
Make the "mark branch dormant" instructions simpler to copy+paste.
|
3 years ago |
Josip Sokcevic
|
4de5deacd4
Explicitly run everything with python3
|
3 years ago |
Gavin Mak
|
9450767ac3
Revert "Error out of rebase-update if there are uncommitted changes"
|
3 years ago |
Gavin Mak
|
eff810e93d
Error out of rebase-update if there are uncommitted changes
|
3 years ago |
Robert Iannucci
|
d3acb16c9c
[git-rebase-update] Disallow `git gc` during git-rebase-update.
|
4 years ago |
Allen Bauer
|
8e404a7e49
Added option to keep empty branches in rebase-update.
|
5 years ago |
Wez
|
fef5cf8e22
Revert "Fix printing error on git-rebase failure"
|
5 years ago |
Josip Sokcevic
|
4511b131e6
Fix printing error on git-rebase failure
|
5 years ago |
Dale Curtis
|
0610193326
Don't delete dormant branches, even if empty.
|
5 years ago |
Marc-Antoine Ruel
|
8e57b4bc55
python3 improvements
|
5 years ago |
Edward Lemur
|
12a537f932
depot_tools: Run git_common_test in Python 3
|
5 years ago |
Edward Lesmes
|
98eda3f3e4
Revert "depot_tools: Run Python scripts using vpython (Part 1)"
|
6 years ago |
Edward Lemur
|
d6186f9936
depot_tools: Run Python scripts using vpython (Part 1)
|
6 years ago |
Raul Tambre
|
80ee78e7fa
Convert print statements to Python 3 style
|
6 years ago |
Henrique Ferreiro
|
fe83cfa6b4
Add --current to rebase the current branch
|
6 years ago |
Henrique Ferreiro
|
3acdefa9aa
Omit "Skipping <branch>" message when unneeded
|
6 years ago |
Sergiy Belozorov
|
b58d4bda63
Add a feature to specify branches to be re-based
|
6 years ago |
Andrew Moylan
|
bfc4082f43
Flush stdout before squash attempt
|
7 years ago |
Robert Iannucci
|
c87e36aaec
[git rebase-update] Handle error when chdir'ing to original workdir.
|
8 years ago |
agable
|
7aa2ddd81d
Refactor git_common config and die
|
9 years ago |
iannucci@chromium.org
|
0d9e59c6ce
Fix rebase-update on windows on git-svn repos.
|
9 years ago |
iannucci@chromium.org
|
aa1dfdab66
Fix multi-rename empty branch detection.
|
9 years ago |
sdefresne@chromium.org
|
d421f6a477
Fix "git rebase-update" when multiple branch are stale.
|
9 years ago |
stip@chromium.org
|
74374f985f
Add a --keep-going flag for people who run rebase-update infrequently.
|
10 years ago |
iannucci@chromium.org
|
196809e75b
Only chdir in rebase-update if there's a directory to go back to.
|
10 years ago |
iannucci@chromium.org
|
dabb78bfd5
Make git-rebase-update a bit more robust
|
10 years ago |
sbc@chromium.org
|
013731e832
Handle KeyboardInterrupt consistently in python scripts
|
10 years ago |
sbc@chromium.org
|
8b4900e77f
Handle unusual case in rebase-update where second rebase attempt works.
|
10 years ago |
sbc@chromium.org
|
384039b174
Improve error handling in git-rebase-update
|
11 years ago |