Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
rebase: fix white-space
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Wed, 24 Jul 2019 21:14:59 +0000
(14:14 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 25 Jul 2019 15:58:03 +0000
(08:58 -0700)
This trailing space was inadvertently introduced in
9fbcc3d203
(Merge
branch 'js/rebase-orig-head-fix', 2019-03-20).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
b697d92
)
diff --git
a/builtin/rebase.c
b/builtin/rebase.c
index db6ca9bd7d4c4e9cdf58eb47fbfce2dda5b58497..2f9041fce2e4a7bd9ca52aba5fcc7e0e6a7c7d5f 100644
(file)
--- a/
builtin/rebase.c
+++ b/
builtin/rebase.c
@@
-2109,7
+2109,7
@@
int cmd_rebase(int argc, const char **argv, const char *prefix)
strbuf_addf(&msg, "%s: checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
if (reset_head(&options.onto->object.oid, "checkout", NULL,
- RESET_HEAD_DETACH | RESET_ORIG_HEAD |
+ RESET_HEAD_DETACH | RESET_ORIG_HEAD |
RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
NULL, msg.buf))
die(_("Could not detach HEAD"));