summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-08-18merge script: handle --no-ff --no-commit correctlyLibravatar Jonathan Nieder1-2/+10
2010-08-18merge script: --ff-only to disallow true mergeLibravatar Jonathan Nieder1-2/+15
2010-08-18merge script: handle many-way octopusLibravatar Jonathan Nieder1-3/+3
2010-08-18merge script: handle -m --log correctlyLibravatar Jonathan Nieder1-4/+10
2010-08-18merge script: forbid merge -s indexLibravatar Jonathan Nieder1-0/+5
2010-08-18merge script: allow custom strategiesLibravatar Jonathan Nieder1-2/+6
2010-08-18merge script: merge -X<option>Libravatar Jonathan Nieder1-1/+7
2010-08-18merge script: improve log message subjectLibravatar Jonathan Nieder1-8/+19
2010-08-18merge script: refuse to merge during mergeLibravatar Jonathan Nieder1-0/+3
2010-08-18merge script: tweak unmerged files message to match builtinLibravatar Jonathan Nieder1-1/+1
2010-08-18merge script: --squash, --ff from unborn branch are errorsLibravatar Jonathan Nieder1-0/+4
2010-08-18fmt-merge-msg -m to override merge titleLibravatar Jonathan Nieder3-4/+55
2010-08-18merge-base --independent to print reduced parent list in a mergeLibravatar Jonathan Nieder3-7/+62
2010-08-18merge-base --octopus to mimic show-branch --merge-baseLibravatar Jonathan Nieder3-10/+46
2010-08-18Documentation: add a SEE ALSO section for merge-baseLibravatar Jonathan Nieder1-0/+6
2010-08-18t6200 (fmt-merge-msg): style nitpicksLibravatar Jonathan Nieder1-160/+120
2010-08-18t6010 (merge-base): modernize styleLibravatar Jonathan Nieder1-143/+160
2010-08-18t7600 (merge): test merge from branch yet to be bornLibravatar Jonathan Nieder1-0/+21
2010-08-18t7600 (merge): check reflog entryLibravatar Jonathan Nieder1-1/+7
2010-08-18t7600 (merge): do not launch gitk for --debugLibravatar Jonathan Nieder1-29/+29
2010-08-18t7600 (merge): modernize styleLibravatar Jonathan Nieder1-187/+101
2010-08-18merge: do not mistake (ancestor of) tag for branchLibravatar Jonathan Nieder2-5/+13
2010-08-18submodule sync: Update "submodule.<name>.url"Libravatar David Aguilar2-1/+5
2010-08-18tests: fix syntax error in "Use advise() for hints" testLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Libravatar Junio C Hamano5-18/+41
2010-08-18Merge branch 'tf/string-list-init'Libravatar Junio C Hamano16-31/+36
2010-08-18Merge branch 'cc/find-commit-subject'Libravatar Junio C Hamano7-49/+62
2010-08-18cvs tests: do not touch test CVS repositories shipped with sourceLibravatar Junio C Hamano5-11/+9
2010-08-18t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisiteLibravatar Ævar Arnfjörð Bjarmason1-13/+15
2010-08-18t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisiteLibravatar Ævar Arnfjörð Bjarmason1-11/+13
2010-08-18t/t7105-reset-patch.sh: Add a PERL prerequisiteLibravatar Ævar Arnfjörð Bjarmason1-4/+4
2010-08-18t/t9001-send-email.sh: convert setup code to testsLibravatar Ævar Arnfjörð Bjarmason1-3/+40
2010-08-18t/t9001-send-email.sh: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-82/+83
2010-08-18t/t9001-send-email.sh: Remove needless PROG=* assignmentLibravatar Ævar Arnfjörð Bjarmason1-1/+0
2010-08-18t/t9600-cvsimport.sh: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-21/+18
2010-08-18lib-patch-mode tests: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason4-28/+23
2010-08-18t/t3701-add-interactive.sh: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-34/+70
2010-08-18tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.shLibravatar Ævar Arnfjörð Bjarmason6-31/+16
2010-08-18t/Makefile: Create test-results dir for smoke targetLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-08-18git-notes: Run partial expensive test everywhereLibravatar Ævar Arnfjörð Bjarmason1-12/+20
2010-08-18t/t3300-funny-names: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-22/+60
2010-08-18t/t3902-quoted: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-17/+21
2010-08-18t/t4016-diff-quote: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-7/+15
2010-08-18t/t5503-tagfollow: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-9/+24
2010-08-18t/t7005-editor: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2010-08-18t/t5705-clone-2gb: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-7/+9
2010-08-18t/t1304-default-acl: change from skip_all=* to prereq skipLibravatar Ævar Arnfjörð Bjarmason1-6/+8
2010-08-18t/README: Update "Skipping tests" to align with best practicesLibravatar Ævar Arnfjörð Bjarmason1-3/+18
2010-08-18t/t7800-difftool.sh: Skip with prereq on no PERLLibravatar Ævar Arnfjörð Bjarmason1-27/+22
2010-08-18t/t5800-remote-helpers.sh: Skip with prereq on python <2.4Libravatar Ævar Arnfjörð Bjarmason1-13/+11
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 05:41:41 +0000