summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-05-29t5520: test for failure if index has unresolved entriesLibravatar Paul Tan1-0/+19
2015-05-18t5520: test no merge candidates casesLibravatar Paul Tan1-0/+55
2015-05-18t5520: prevent field splitting in content comparisonsLibravatar Paul Tan1-35/+35
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxLibravatar Junio C Hamano7-9/+9
2015-04-29merge: handle FETCH_HEAD internallyLibravatar Junio C Hamano3-39/+81
2015-04-29merge: decide if we auto-generate the message early in collect_parents()Libravatar Junio C Hamano1-7/+9
2015-04-29merge: make collect_parents() auto-generate the merge messageLibravatar Junio C Hamano1-14/+22
2015-04-29merge: extract prepare_merge_message() logic outLibravatar Junio C Hamano1-11/+15
2015-04-29merge: narrow scope of merge_namesLibravatar Junio C Hamano1-4/+7
2015-04-29merge: split reduce_parents() out of collect_parents()Libravatar Junio C Hamano1-16/+25
2015-04-29merge: clarify collect_parents() logicLibravatar Junio C Hamano1-2/+11
2015-04-29merge: small leakfix and code simplificationLibravatar Junio C Hamano1-2/+2
2015-04-29merge: do not check argc to determine number of remote headsLibravatar Junio C Hamano1-3/+2
2015-04-29merge: clarify "pulling into void" special caseLibravatar Junio C Hamano1-17/+18
2015-04-29t5520: test pulling an octopus into an unborn branchLibravatar Junio C Hamano1-0/+9
2015-04-29t5520: style fixesLibravatar Junio C Hamano1-16/+6
2015-04-29merge: simplify code flowLibravatar Junio C Hamano1-8/+8
2015-04-29merge: test the top-level merge driverLibravatar Junio C Hamano1-0/+136
2015-01-12Git 2.2.2Libravatar Junio C Hamano3-2/+33
2015-01-12Merge branch 'jk/read-packed-refs-without-path-max' into maintLibravatar Junio C Hamano1-21/+25
2015-01-12Merge branch 'mg/add-ignore-errors' into maintLibravatar Junio C Hamano2-2/+8
2015-01-12Merge branch 'mh/find-uniq-abbrev' into maintLibravatar Junio C Hamano1-1/+1
2015-01-12Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintLibravatar Junio C Hamano2-9/+15
2015-01-12Merge branch 'rw/apply-does-not-take-ignore-date' into maintLibravatar Junio C Hamano1-1/+0
2015-01-12Merge branch 'jk/for-each-reflog-ent-reverse' into maintLibravatar Junio C Hamano2-12/+67
2015-01-07Merge branch 'maint-2.1' into maintLibravatar Junio C Hamano2-12/+35
2015-01-07Merge branch 'maint-2.0' into maint-2.1Libravatar Junio C Hamano2-12/+35
2015-01-07Merge branch 'maint-1.9' into maint-2.0Libravatar Junio C Hamano2-12/+35
2015-01-07Merge branch 'maint-1.8.5' into maint-1.9Libravatar Junio C Hamano2-12/+35
2015-01-07Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5Libravatar Junio C Hamano2-12/+35
2014-12-29is_hfs_dotgit: loosen over-eager match of \u{..47}Libravatar Jeff King2-12/+35
2014-12-22Prepare for 2.2.2Libravatar Junio C Hamano2-1/+34
2014-12-22Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintLibravatar Junio C Hamano1-4/+10
2014-12-22Merge branch 'jk/no-perl-tests' into maintLibravatar Junio C Hamano3-4/+4
2014-12-22Merge branch 'po/everyday-doc' into maintLibravatar Junio C Hamano1-1/+1
2014-12-22Merge branch 'jk/push-simple' into maintLibravatar Junio C Hamano2-6/+34
2014-12-22Merge branch 'mh/config-flip-xbit-back-after-checking' into maintLibravatar Junio C Hamano2-1/+9
2014-12-22Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maintLibravatar Junio C Hamano1-1/+5
2014-12-22Merge branch 'rs/receive-pack-use-labs' into maintLibravatar Junio C Hamano1-1/+1
2014-12-22Merge branch 'rs/maint-config-use-labs' into maintLibravatar Junio C Hamano1-2/+2
2014-12-22Merge branch 'js/windows-open-eisdir-error' into maintLibravatar Junio C Hamano1-1/+1
2014-12-22Merge branch 'jk/colors-fix' into maintLibravatar Junio C Hamano3-14/+25
2014-12-22Merge branch 'jk/checkout-from-tree' into maintLibravatar Junio C Hamano2-0/+35
2014-12-22clean: typofixLibravatar Alexander Kuleshov1-1/+1
2014-12-17Git 2.2.1Libravatar Junio C Hamano4-3/+38
2014-12-17Sync with v2.1.4Libravatar Junio C Hamano19-42/+406
2014-12-17Git 2.1.4Libravatar Junio C Hamano4-3/+38
2014-12-17Sync with v2.0.5Libravatar Junio C Hamano18-41/+370
2014-12-17Git 2.0.5Libravatar Junio C Hamano4-3/+38
2014-12-17Sync with v1.9.5Libravatar Junio C Hamano17-40/+334
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 00:01:02 +0000