summaryrefslogtreecommitdiff
path: root/t/t6200-fmt-merge-msg.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fs/ssh-signing-key-lifetime'Junio C Hamano2022-01-121-0/+8
|\
| * fmt-merge-msg: prevent use-after-free with signed tagsTaylor Blau2022-01-101-0/+8
* | Merge branch 'jc/merge-detached-head-name'Junio C Hamano2022-01-051-1/+41
|\ \
| * | merge: allow to pretend a merge is made into a different branchJunio C Hamano2021-12-201-1/+41
* | | Merge branch 'es/test-chain-lint'Junio C Hamano2022-01-031-1/+1
|\ \ \ | |_|/ |/| |
| * | t6000-t9999: detect and signal failure within loopEric Sunshine2021-12-131-1/+1
| |/
* | ssh signing: make fmt-merge-msg consider key lifetimeFabian Stelzer2021-12-091-0/+58
* | t/fmt-merge-msg: make gpgssh tests more specificFabian Stelzer2021-12-091-0/+2
* | t/fmt-merge-msg: do not redirect stderrFabian Stelzer2021-12-091-4/+4
|/
* ssh signing: fmt-merge-msg tests & config parseFabian Stelzer2021-10-121-0/+28
* t6[0-3]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-26/+26
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* t6200: adjust suppression pattern to also match "main"Johannes Schindelin2020-10-231-1/+1
* fmt-merge-msg: allow merge destination to be omitted againJunio C Hamano2020-07-301-0/+20
* Revert "fmt-merge-msg: stop treating `master` specially"Junio C Hamano2020-07-301-18/+18
* fmt-merge-msg: stop treating `master` speciallyJohannes Schindelin2020-06-231-18/+18
* t: avoid alternation (not POSIX) in grep's BRECarlo Marcelo Arenas Belón2020-05-291-1/+1
* t: increase test coverage of signature verification outputHans Jerry Illikainen2020-03-151-0/+23
* t6200: use test_commit_bulkJeff King2019-07-231-6/+1
* tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor2018-08-211-3/+1
* merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tagsJunio C Hamano2018-02-161-1/+1
* t: fix trivial &&-chain breakageJeff King2015-03-201-1/+1
* Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-191-3/+3
|\
| * t6200: avoid path mangling issue on WindowsJohannes Sixt2013-04-181-3/+3
* | Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-151-0/+18
|\ \ | |/
| * fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-071-0/+18
* | t6200: test message for merging of an annotated tagJunio C Hamano2013-04-011-0/+39
* | t6200: use test_config/test_unconfigJunio C Hamano2013-04-011-32/+29
|/
* fmt-merge-msg: make attribution into comment linesJunio C Hamano2012-06-061-18/+18
* fmt-merge-msg: show those involved in a merged seriesjc/fmt-merge-msg-peopleJunio C Hamano2012-03-131-3/+24
* t6200-fmt-merge-msg: Exercise '--log' to configure shortlog lengthRamkumar Ramachandra2010-09-091-0/+43
* t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog lengthRamkumar Ramachandra2010-09-091-0/+48
* fmt-merge-msg -m to override merge titleJonathan Nieder2010-08-181-0/+32
* t6200 (fmt-merge-msg): style nitpicksJonathan Nieder2010-08-181-160/+120
* t6200: test fmt-merge-msg moreStephen Boyd2010-03-241-0/+115
* t6200: modernize with test_tickStephen Boyd2010-03-241-35/+29
* fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-241-0/+19
* Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-291-0/+32
|\
| * apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-231-0/+32
* | Tests on Windows: $(pwd) must return Windows-style pathsJohannes Sixt2009-03-191-2/+2
|/
* tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-171-2/+2
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-8/+8
* Merge branch 'bd/tests'Junio C Hamano2008-05-141-3/+3
|\
| * Rename the test trash directory to contain spaces.Bryan Donlan2008-05-051-3/+3
* | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-121-3/+51
|/
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-5/+5
* [PATCH] Rename git-repo-config to git-config.Tom Prince2007-01-281-3/+3
* t6200: fmt-merge-msg test.Junio C Hamano2006-07-031-0/+163
View Lorry Controller Status