diff options
| author | Andrew Kreimer <algonell@gmail.com> | 2024-10-24 13:47:20 +0200 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2024-10-24 18:45:53 +0200 |
| commit | f56f9d6c0b83399c0c95b7630b7e3d3d57b495f5 (patch) | |
| tree | c1723f82a36a89a212480f4740f59c17d2c33811 /t/t7601-merge-pull-config.sh | |
| parent | The third batch (diff) | |
| download | git-f56f9d6c0b83399c0c95b7630b7e3d3d57b495f5.tar.xz git-f56f9d6c0b83399c0c95b7630b7e3d3d57b495f5.zip | |
t: fix typos
Fix typos and grammar in documentation, comments, etc.
Via codespell.
Reported-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Signed-off-by: Andrew Kreimer <algonell@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t7601-merge-pull-config.sh')
| -rwxr-xr-x | t/t7601-merge-pull-config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 7fd8c086af..c83298ba68 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -281,7 +281,7 @@ test_expect_success '--rebase overrides pull.ff unset' ' test_does_rebase pull --rebase ' -# Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff +# Group 4: --no-rebase heeds pull.ff=!only or explicit --ff or --no-ff test_expect_success '--no-rebase works with --no-ff' ' test_does_merge_when_ff_possible pull --no-rebase --no-ff |