summaryrefslogtreecommitdiff
path: root/t/t6200-fmt-merge-msg.sh
AgeCommit message (Expand)Author
6 dayst: avoid alternation (not POSIX) in grep's BRECarlo Marcelo Arenas Belón
2020-03-15t: increase test coverage of signature verification outputHans Jerry Illikainen
2019-07-23t6200: use test_commit_bulkJeff King
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor
2018-02-16merge: allow fast-forward when merging a tracked tagJunio C Hamano
2015-03-20t: fix trivial &&-chain breakageJeff King
2013-04-19Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano
2013-04-18t6200: avoid path mangling issue on WindowsJohannes Sixt
2013-04-15Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano
2013-04-07fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow
2013-04-01t6200: test message for merging of an annotated tagJunio C Hamano
2013-04-01t6200: use test_config/test_unconfigJunio C Hamano
2012-06-06fmt-merge-msg: make attribution into comment linesJunio C Hamano
2012-03-14fmt-merge-msg: show those involved in a merged seriesJunio C Hamano
2010-09-09t6200-fmt-merge-msg: Exercise '--log' to configure shortlog lengthRamkumar Ramachandra
2010-09-09t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog lengthRamkumar Ramachandra
2010-08-18fmt-merge-msg -m to override merge titleJonathan Nieder
2010-08-18t6200 (fmt-merge-msg): style nitpicksJonathan Nieder
2010-03-25t6200: test fmt-merge-msg moreStephen Boyd
2010-03-25t6200: modernize with test_tickStephen Boyd
2010-03-25fmt-merge-msg: be quiet if nothing to mergeStephen Boyd
2009-05-29Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano
2009-05-23apply, fmt-merge-msg: use relative filenamesStephen Boyd
2009-03-19Tests on Windows: $(pwd) must return Windows-style pathsJohannes Sixt
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano
2008-05-14Merge branch 'bd/tests'Junio C Hamano
2008-05-05Rename the test trash directory to contain spaces.Bryan Donlan
2008-04-13fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor
2007-03-04Get rid of the dependency to GNU diff in the testsJohannes Schindelin
2007-01-29[PATCH] Rename git-repo-config to git-config.Tom Prince
2006-07-04t6200: fmt-merge-msg test.Junio C Hamano