Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ag/rebase-i-in-c'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 13 Nov 2018 13:37:25 +0000
(22:37 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 13 Nov 2018 13:37:25 +0000
(22:37 +0900)
Code clean-up for a topic already in 'master'.
* ag/rebase-i-in-c:
sequencer.c: remove a stray semicolon
sequencer.c
patch
|
blob
|
history
raw
(from parent 1:
2281aa8
)
diff --git
a/sequencer.c
b/sequencer.c
index 1869435a721ae6eee502b393357b41a58f4e7582..63a2094cac277359f23c8bdfa102cb5785e70d69 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-4899,7
+4899,7
@@
int complete_action(struct replay_opts *opts, unsigned flags,
if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head))
return -1;
-;
+
if (require_clean_work_tree("rebase", "", 1, 1))
return -1;