]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/pull.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 80dbfac fedd5c7)
Merge branch 'bc/zsh-compatibility'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2024 17:18:46 +0000 (10:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2024 17:18:46 +0000 (10:18 -0700)
commitc2b36ab32ec9d5b6ede9b808a0986ab1cb281b42
tree2714b8088ac0d5d43f13b2150ae30055bda635f2tree | snapshot
parent80dbfac2aad6862ec6b876090e0b1bfddd7a956fcommit | diff
parentfedd5c79ff855a4e3859e5c3fa5784942185436bcommit | diff
Merge branch 'bc/zsh-compatibility'

zsh can pretend to be a normal shell pretty well except for some
glitches that we tickle in some of our scripts. Work them around
so that "vimdiff" and our test suite works well enough with it.

* bc/zsh-compatibility:
  vimdiff: make script and tests work with zsh
  t4046: avoid continue in &&-chain for zsh
Unnamed repository; edit this file 'description' to name the repository.