summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-09-29diff: add synonyms for -M, -C, -BLibravatar Kevin Ballard2-3/+25
2010-09-29merge-recursive: option to specify rename thresholdLibravatar Kevin Ballard5-3/+16
2010-08-27merge-recursive: options to ignore whitespace changesLibravatar Justin Frankel3-0/+207
2010-08-26merge-recursive --patienceLibravatar Justin Frankel6-0/+14
2010-08-26ll-merge: replace flag argument with options structLibravatar Jonathan Nieder7-66/+104
2010-08-26merge-recursive: expose merge options for builtin mergeLibravatar Jonathan Nieder4-31/+26
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder8-8/+45
2010-08-06rerere: never renormalizeLibravatar Jonathan Nieder1-6/+5
2010-08-06rerere: migrate to parse-options APILibravatar Jonathan Nieder2-24/+119
2010-08-06t4200 (rerere): modernize styleLibravatar Jonathan Nieder1-125/+180
2010-08-06ll-merge: let caller decide whether to renormalizeLibravatar Jonathan Nieder5-8/+19
2010-08-06ll-merge: make flag easier to populateLibravatar Jonathan Nieder4-9/+28
2010-08-06Documentation/technical: document ll_mergeLibravatar Jonathan Nieder1-0/+70
2010-08-06merge-trees: let caller decide whether to renormalizeLibravatar Jonathan Nieder2-1/+3
2010-08-06merge-trees: push choice to renormalize away from low levelLibravatar Jonathan Nieder1-4/+5
2010-08-06t6038 (merge.renormalize): check that it can be turned offLibravatar Jonathan Nieder1-1/+49
2010-08-06t6038 (merge.renormalize): try checkout -m and cherry-pickLibravatar Jonathan Nieder1-0/+41
2010-08-06t6038 (merge.renormalize): style nitpicksLibravatar Jonathan Nieder1-8/+44
2010-07-02Don't expand CRLFs when normalizing text during mergeLibravatar Eyvind Bernhardsen1-7/+20
2010-07-02Try normalizing files to avoid delete/modify conflicts when mergingLibravatar Eyvind Bernhardsen2-3/+50
2010-07-02Avoid conflicts when merging branches with mixed normalizationLibravatar Eyvind Bernhardsen8-2/+143
2010-06-27Git 1.7.2-rc0Libravatar Junio C Hamano1-1/+11
2010-06-27Merge branch 'cp/textconv-cat-file'Libravatar Junio C Hamano7-15/+155
2010-06-27Merge branch 'pb/maint-perl-errmsg-no-dir'Libravatar Junio C Hamano1-2/+2
2010-06-27Merge branch 'tr/send-email-8bit'Libravatar Junio C Hamano3-0/+146
2010-06-27Merge branch 'js/maint-am-rebase-invalid-author'Libravatar Junio C Hamano2-6/+17
2010-06-27Merge branch 'ab/blame-textconv'Libravatar Junio C Hamano4-21/+165
2010-06-27Merge branch 'jn/show-num-walks'Libravatar Junio C Hamano1-0/+4
2010-06-25Merge branch 'maint'Libravatar Junio C Hamano5-10/+10
2010-06-25msvc: Fix some compiler warningsLibravatar Ramsay Jones1-4/+4
2010-06-25Documentation: grep: fix asciidoc problem with --Libravatar Christian Couder1-1/+1
2010-06-24git-cat-file.txt: Document --textconvLibravatar Michael J Gruber1-2/+8
2010-06-24msvc: Fix some "expr evaluates to function" compiler warningsLibravatar Ramsay Jones3-5/+5
2010-06-23Merge branch 'jk/url-decode'Libravatar Junio C Hamano1-10/+18
2010-06-23url.c: "<scheme>://" part at the beginning should not be URL decodedLibravatar Junio C Hamano1-10/+18
2010-06-22Update draft release notes to 1.7.2Libravatar Junio C Hamano1-12/+41
2010-06-22Merge branch 'jc/maint-simpler-common-prefix'Libravatar Junio C Hamano1-13/+13
2010-06-22Merge branch 'sb/format-patch-signature'Libravatar Junio C Hamano6-4/+85
2010-06-22Merge branch 'mg/pretty-magic-space'Libravatar Junio C Hamano3-4/+25
2010-06-22Merge branch 'jn/gitweb-return-or-exit-cleanup'Libravatar Junio C Hamano1-0/+9
2010-06-22Merge branch 'bd/maint-unpack-trees-parawalk-fix'Libravatar Junio C Hamano1-2/+10
2010-06-22Merge branch 'cc/cherry-pick-series'Libravatar Junio C Hamano4-66/+264
2010-06-22Merge branch 'jc/rev-list-ancestry-path'Libravatar Junio C Hamano4-3/+226
2010-06-22Merge branch 'lt/extended-sha1-match-commit-with-regexp'Libravatar Junio C Hamano1-3/+9
2010-06-22Merge branch 'maint'Libravatar Junio C Hamano4-4/+24
2010-06-22Update draft release notes to 1.7.1.1Libravatar Junio C Hamano1-0/+21
2010-06-22Merge branch 'ic/maint-rebase-i-abort' into maintLibravatar Junio C Hamano2-1/+12
2010-06-22Merge branch 'cc/maint-commit-reflog-msg' into maintLibravatar Junio C Hamano2-6/+13
2010-06-22Merge branch 'jk/maint-advice-empty-amend' into maintLibravatar Junio C Hamano1-0/+7
2010-06-22Merge branch 'tc/commit-abbrev-fix' into maintLibravatar Junio C Hamano2-6/+72
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 16:07:28 +0000