summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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-07-21Git 1.7.2Libravatar Junio C Hamano3-9/+10
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 Hamano2-2/+6
2010-07-20t/README: clarify test_must_fail descriptionLibravatar Brandon Casey1-0/+8
2010-07-20Check size of path buffer before writing into itLibravatar Greg Brockman1-0/+2
2010-07-19Merge branch 'maint'Libravatar Junio C Hamano2-3/+10
2010-07-19update-server-info: Shorten read_pack_info_file()Libravatar Ralf Thielow1-3/+0
2010-07-19git add: Add --ignore-missing to SYNOPSISLibravatar Ævar Arnfjörð Bjarmason1-1/+2
2010-07-19git submodule add: Remove old docs about implicit -fLibravatar Ævar Arnfjörð Bjarmason1-4/+0
2010-07-19git submodule add: Require the new --force option to add ignored pathsLibravatar Jens Lehmann3-15/+35
2010-07-19Merge branch 'jl/add-n-ignore-missing'Libravatar Junio C Hamano5-6/+47
2010-07-19Documentation: Explain git-mergetool's use of temporary filesLibravatar David Aguilar1-0/+10
2010-07-19git-svn: write memoized data explicitly to avoid Storable bugLibravatar Sergey Vlasov1-0/+16
2010-07-16Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-13/+0
2010-07-16Only run aggregate-results over actual countsLibravatar Thomas Rast2-2/+2
2010-07-16Add a sample user for the svndump libraryLibravatar Jonathan Nieder4-0/+147
2010-07-16diff A...B: do not limit the syntax too narrowlyLibravatar Junio C Hamano1-13/+0
2010-07-15Merge branch 'jn/paginate-fix'Libravatar Junio C Hamano2-46/+200
2010-07-15Merge branch 'wp/merge-tree-fix'Libravatar Junio C Hamano2-1/+259
2010-07-15Merge branch 'js/merge-rr-fix'Libravatar Junio C Hamano2-3/+3
2010-07-15Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-8/+23
2010-07-15Merge branch 'ns/merge-recursive-uptodate'Libravatar Junio C Hamano1-1/+1
2010-07-15Merge branch 'jn/tests'Libravatar Junio C Hamano1-47/+42
2010-07-15Merge branch 'eb/doc-log-manpage'Libravatar Junio C Hamano1-6/+9
2010-07-15Merge branch 'jn/grep-open'Libravatar Junio C Hamano2-0/+16
2010-07-15Merge branch 'mg/revision-doc'Libravatar Junio C Hamano20-222/+257
2010-07-15Merge branch 'jk/maint-status-keep-index-timestamp'Libravatar Junio C Hamano1-5/+11
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 15:10:56 +0000