git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/2] rebase: fix white-space

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Jul 24, 2019, 21:14 UTC
Message-ID
<3bcebf1eae3cad9c55d233f2271126a99e9e34cb.1564002897.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.293.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 9c52144fc4..798b9ae2d7 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -2104,7 +2104,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"));
-- 
gitgitgadget
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 2 of 5 in “Clean up more of the fall-out from dropping the scripted git rebase”
  1. 0/2 Clean up more of the fall-out from dropping the scripted git rebaseJohannes Schindelin via GitGitGadget, Jul 24, 2019
  2. 1/2 rebase: fix white-spaceJohannes Schindelin via GitGitGadget, Jul 24, 2019
  3. 2/2 git: mark cmd_rebase as requiring a worktreeJohannes Schindelin via GitGitGadget, Jul 24, 2019
  4. Junio C HamanoJul 25, 2019
  5. Johannes SchindelinJul 25, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.