* [PATCH 0/1] t3404: fix a typo
@ 2019-06-14 12:16 Johannes Schindelin via GitGitGadget
2019-06-14 12:16 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-06-14 12:16 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Just a typo I found while debugging something else.
Johannes Schindelin (1):
t3404: fix a typo
t/t3404-rebase-interactive.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
base-commit: 0aae918dd929862d3ce0ea2960897787bb269a3b
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-267%2Fdscho%2Ffix-typo-confilct-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-267/dscho/fix-typo-confilct-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/267
--
gitgitgadget
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] t3404: fix a typo
2019-06-14 12:16 [PATCH 0/1] t3404: fix a typo Johannes Schindelin via GitGitGadget
@ 2019-06-14 12:16 ` Johannes Schindelin via GitGitGadget
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-06-14 12:16 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
This one slipped through the review of a9279c678588 (sequencer: do not
squash 'reword' commits when we hit conflicts, 2018-06-19).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/t3404-rebase-interactive.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 1723e1a858..46d971b4ef 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1031,7 +1031,7 @@ test_expect_success 'rebase -i --root reword root commit' '
test -z "$(git show -s --format=%p HEAD^)"
'
-test_expect_success 'rebase -i --root when root has untracked file confilct' '
+test_expect_success 'rebase -i --root when root has untracked file conflict' '
test_when_finished "reset_rebase" &&
git checkout -b failing-root-pick A &&
echo x >file2 &&
--
gitgitgadget
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-14 12:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-14 12:16 [PATCH 0/1] t3404: fix a typo Johannes Schindelin via GitGitGadget
2019-06-14 12:16 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.