From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 May 2026 00:40:07 +0000 (+0900)
Subject: Merge branch 'mm/diff-U-takes-no-negative-values'
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5830a84a1425a004a4a6377110a9fa9513c514ce;p=thirdparty%2Fgit.git

Merge branch 'mm/diff-U-takes-no-negative-values'

The command line parser for "git diff" learned a few options take
only non-negative integers.

* mm/diff-U-takes-no-negative-values:
  parse-options: clarify what "negated" means for PARSE_OPT_NONEG
  xdiff: guard against negative context lengths
  diff: reject negative values for -U/--unified
  diff: reject negative values for --inter-hunk-context
---

5830a84a1425a004a4a6377110a9fa9513c514ce