aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7611-merge-abort.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-11-06 15:17:01 -0800
committerJunio C Hamano <gitster@pobox.com>2025-11-06 15:17:01 -0800
commit4badef0c3503dc29059d678abba7fac0f042bc84 (patch)
treee5284d2d90ed97ef7191b630cfad5c49ffba9f49 /t/t7611-merge-abort.sh
parentMerge branch 'cc/fast-import-export-i18n-cleanup' (diff)
parentparseopt: remove unreachable code (diff)
downloadgit-master.tar.gz
git-master.zip
Merge branch 'dk/parseopt-optional-filename-fixes'HEADmastermain
A recently added configuration variable and command line option syntax ":(optional)" for values that are of filename type inconsistently behaved on an empty file (configuration took it happily, while the command line option pretended as if it did not exist), which has been corrected. * dk/parseopt-optional-filename-fixes: parseopt: remove unreachable code parseopt: restore const qualifier to parsed filename config: use boolean type for a simple flag parseopt: use boolean type for a simple flag doc: clarify command equivalence comment parseopt: fix :(optional) at command line to only ignore missing files
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions
span class='insertions'>+2905 2020-01-08config/advice.txt: fix description list separatorMartin Ågren1-1/+1 2020-01-08Git 2.25-rc2v2.25.0-rc2Junio C Hamano2-1/+5 2020-01-08graph: fix lack of color in horizontal linesDerrick Stolee2-4/+38 2020-01-08graph: drop assert() for merge with two collapsing parentsDerrick Stolee2-4/+42 2020-01-06The final batch before -rc2Junio C Hamano1-2/+18 2020-01-06doc: submodule: fix typo for command absorbgitdirsThomas Menzel1-1/+1 2020-01-06l10n: es: 2.25.0 round #1Christopher Diaz Riveros1-2282/+2838 2020-01-04am: document that Date: can appear as an in-body headerPaul Menzel1-2/+2 2020-01-04gitweb: fix a couple spelling errors in commentsDenis Ovsienko1-2/+2 2020-01-04multi-pack-index: correct configuration in documentationJohannes Berg1-1/+1 2020-01-04Documentation/git-sparse-checkout.txt: fix a typoTaylor Blau1-1/+1 2020-01-04l10n: sv.po: Update Swedish translation (4800t0f0u)Peter Krefting1-2282/+2825 2020-01-03l10n: fr.po v2.25.0 rnd 1Jean-Noël Avila1-2271/+2800 2020-01-03l10n: vi(4800t): Updated Vietnamese translation v2.25.0Tran Ngoc Quan1-2273/+2839 2020-01-02commit-graph: prefer default size_mult when given zeroDerrick Stolee2-4/+4 2020-01-02mingw: only test index entries for backslashes, not tree entriesJohannes Schindelin3-9/+9 2020-01-02Git 2.25-rc1v2.25.0-rc1Junio C Hamano2-1/+14 2020-01-02merge-recursive: remove unnecessary oid_eq functionElijah Newren1-22/+11 2020-01-02sparse-checkout: use extern for global variablesDerrick Stolee1-2/+2 2019-12-31l10n: zh_TW.po: update translation for v2.25.0 round 1pan934121-2343/+2974 2019-12-31git-gui: allow opening currently selected file in default appZoli Szabó1-5/+24 2019-12-30sparse-checkout: document interactions with submodulesDerrick Stolee2-0/+38 2019-12-30sparse-checkout: list directories in cone modeDerrick Stolee3-1/+42 2019-12-30l10n: it.po: update the Italian translation for Git 2.25.0Alessandro Menti1-2277/+2854 2019-12-30l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)Jiang Xin1-2252/+2755 2019-12-27t3008: find test-tool through path lookupJohannes Sixt1-1/+1 2019-12-27l10n: Update Catalan translationJordi Mas1-8/+8 2019-12-26packfile: replace lseek+read with preadEric Wong1-3/+2 2019-12-26doc: log, gitk: line-log arguments must exist in starting revisionPhilippe Blain2-2/+4 2019-12-26doc: log, gitk: document accepted line-log diff formatsPhilippe Blain2-2/+8 2019-12-26packfile: remove redundant fcntl F_GETFD/F_SETFDEric Wong1-11/+0 2019-12-26mailmap: mask accentless variant for Công DanhJunio C Hamano1-0/+1 2019-12-25Git 2.25-rc0v2.25.0-rc0Junio C Hamano2-6/+27 2019-12-21mingw: refuse paths containing reserved namesJohannes Schindelin3-18/+110 2019-12-21mingw: short-circuit the conversion of `/dev/null` to UTF-16Johannes Schindelin1-10/+16 2019-12-20sparse-checkout: improve OS ls compatibilityEd Maste1-14/+22