summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-0/+145
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedLibravatar Johan Herland1-0/+76
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-0/+12
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-0/+176
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-0/+292
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-0/+502
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-0/+188
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+180
2010-11-17notes.c: Use two newlines (instead of one) when concatenating notesLibravatar Johan Herland4-0/+11
2010-11-17(trivial) t3303: Indent with tabs instead of spaces for consistencyLibravatar Johan Herland1-9/+9
2010-08-09t7003: fix subdirectory-filter testLibravatar Thomas Rast1-1/+2
2010-08-06Allow "check-ref-format --branch" from subdirectoryLibravatar Jonathan Nieder1-0/+17
2010-08-02Merge branch 'ab/tap' into maintLibravatar Junio C Hamano1-4/+3
2010-08-02test-lib: Remove 3 year old no-op --no-python optionLibravatar Ævar Arnfjörð Bjarmason1-3/+0
2010-08-02test-lib: Ignore --quiet under a TAP harnessLibravatar Ævar Arnfjörð Bjarmason1-1/+3
2010-07-28Fix git rebase --continue to work with touched filesLibravatar David D. Kilzer1-0/+43
2010-07-27Sync with 1.7.1.2Libravatar Junio C Hamano1-1/+23
2010-07-27Sync with 1.7.0 seriesLibravatar Junio C Hamano1-1/+23
2010-07-27config --get --path: check for unset $HOMELibravatar Jonathan Nieder1-1/+23
2010-07-25t3700-add: fix dependence on stdout and stderr bufferingLibravatar Johannes Sixt1-3/+6
2010-07-25git-rebase--interactive.sh: use printf instead of echo to print commit messageLibravatar Brandon Casey1-1/+7
2010-07-25Merge branch 'maint-1.6.6' into maint-1.7.0Libravatar Junio C Hamano1-0/+18
2010-07-25Merge branch 'maint-1.6.5' into maint-1.6.6Libravatar Junio C Hamano1-0/+18
2010-07-25Merge branch 'maint-1.6.4' into maint-1.6.5Libravatar Junio C Hamano1-0/+18
2010-07-21tests: correct "does reflog exist?" testsLibravatar Junio C Hamano2-49/+11
2010-07-21t/: work around one-shot variable assignment with test_must_failLibravatar Brandon Casey3-8/+40
2010-07-21t/README: correct an exception when breaking a && chain in testsLibravatar Jonathan Nieder1-4/+4
2010-07-20t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_failLibravatar Brandon Casey2-2/+2
2010-07-20t/t3700: convert two uses of negation operator '!' to use test_must_failLibravatar Brandon Casey1-2/+2
2010-07-20Merge branch 'maint'Libravatar Junio C Hamano1-2/+4
2010-07-20t/README: clarify test_must_fail descriptionLibravatar Brandon Casey1-0/+8
2010-07-19git submodule add: Require the new --force option to add ignored pathsLibravatar Jens Lehmann1-12/+15
2010-07-19Merge branch 'jl/add-n-ignore-missing'Libravatar Junio C Hamano1-0/+25
2010-07-16Only run aggregate-results over actual countsLibravatar Thomas Rast2-2/+2
2010-07-15Merge branch 'jn/paginate-fix'Libravatar Junio C Hamano1-45/+196
2010-07-15Merge branch 'wp/merge-tree-fix'Libravatar Junio C Hamano1-0/+257
2010-07-15Merge branch 'js/merge-rr-fix'Libravatar Junio C Hamano1-2/+2
2010-07-15Merge branch 'jn/tests'Libravatar Junio C Hamano1-47/+42
2010-07-15Merge branch 'jn/grep-open'Libravatar Junio C Hamano1-0/+15
2010-07-15Merge branch 'jc/rebase-i-commit-msg-fix'Libravatar Junio C Hamano1-0/+18
2010-07-15Merge branch 'ab/submodule-add-f'Libravatar Junio C Hamano1-1/+23
2010-07-14git --paginate: paginate external commands againLibravatar Jonathan Nieder1-12/+35
2010-07-14MERGE_RR is in .git, not .git/rr-cacheLibravatar Jay Soffian1-2/+2
2010-07-14merge-tree: fix where two branches share no changesLibravatar Will Palmer1-3/+3
2010-07-14add basic tests for merge-treeLibravatar Will Palmer1-0/+257
2010-07-14Merge branch 'jc/read-tree-cache-tree-fix'Libravatar Junio C Hamano1-0/+16
2010-07-12git add: Add the "--ignore-missing" option for the dry runLibravatar Jens Lehmann1-0/+25
2010-07-12test-lib: TAP compliance for skipping tests on requestLibravatar Michael J Gruber1-2/+2
2010-07-12test-lib: simplify GIT_SKIP_TESTS loopLibravatar Michael J Gruber1-10/+3
2010-07-11Merge branch 'maint'Libravatar Junio C Hamano1-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 12:14:54 +0000