chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e7a1d36
)
git-debrebase: fix break out fproblem
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 9 Feb 2018 21:54:45 +0000
(21:54 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 19:19:07 +0000
(19:19 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index a8cf7917d76656a735be3c776c6fcec8b447eac1..b70f8d91ff1f0824dd24cdd0fc3c1c643ddabf20 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-912,7
+912,7
@@
sub cmd_new_upstream_v0 () {
in_workarea sub {
my @upstream_merge_parents;
- if (!$problems) {
+ if (!$
f
problems) {
push @upstream_merge_parents, $old_upstream->{CommitId};
}