summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder4-5/+32
2010-08-06rerere: migrate to parse-options APILibravatar Jonathan Nieder1-24/+28
2010-08-06ll-merge: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-0/+4
2010-07-02Avoid conflicts when merging branches with mixed normalizationLibravatar Eyvind Bernhardsen1-0/+3
2010-06-27Merge branch 'cp/textconv-cat-file'Libravatar Junio C Hamano2-8/+38
2010-06-27Merge branch 'ab/blame-textconv'Libravatar Junio C Hamano1-13/+72
2010-06-25Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2010-06-24msvc: Fix some "expr evaluates to function" compiler warningsLibravatar Ramsay Jones1-1/+1
2010-06-22Merge branch 'sb/format-patch-signature'Libravatar Junio C Hamano1-3/+15
2010-06-22Merge branch 'cc/cherry-pick-series'Libravatar Junio C Hamano1-41/+79
2010-06-22Merge branch 'cc/maint-commit-reflog-msg' into maintLibravatar Junio C Hamano1-4/+9
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 Hamano1-6/+4
2010-06-22Merge branch 'cb/ls-files-cdup' into maintLibravatar Junio C Hamano1-34/+41
2010-06-22Merge branch 'tc/merge-m-log' into maintLibravatar Junio C Hamano2-36/+60
2010-06-22Merge branch 'ph/clone-message-reword' into maintLibravatar Junio C Hamano1-1/+2
2010-06-22Merge branch 'jn/maint-amend-missing-name' into maintLibravatar Junio C Hamano1-7/+13
2010-06-22Merge branch 'pc/remove-warn' into maintLibravatar Junio C Hamano1-5/+1
2010-06-21Merge branch 'cc/maint-commit-reflog-msg'Libravatar Junio C Hamano1-4/+9
2010-06-21Merge branch 'jk/maint-advice-empty-amend'Libravatar Junio C Hamano1-0/+7
2010-06-21Merge branch 'sm/branch-broken-ref'Libravatar Junio C Hamano1-6/+22
2010-06-21Merge branch 'tc/commit-abbrev-fix'Libravatar Junio C Hamano1-6/+4
2010-06-21Merge branch 'tr/receive-pack-aliased-update-fix'Libravatar Junio C Hamano1-2/+2
2010-06-21Merge branch 'gs/usage-to-stdout'Libravatar Junio C Hamano1-1/+2
2010-06-21Merge branch 'gv/portable'Libravatar Junio C Hamano12-25/+38
2010-06-21Merge branch 'em/checkout-orphan'Libravatar Junio C Hamano1-3/+28
2010-06-21Merge branch 'rs/diff-no-minimal' into maintLibravatar Junio C Hamano4-4/+4
2010-06-21Merge branch 'bg/apply-blank-trailing-context' into maintLibravatar Junio C Hamano1-6/+6
2010-06-18textconv: support for cat_fileLibravatar Clément Poulain2-8/+38
2010-06-18Merge branch 'cb/ls-files-cdup'Libravatar Junio C Hamano1-34/+41
2010-06-18Merge branch 'mg/status-b'Libravatar Junio C Hamano1-2/+6
2010-06-18Merge branch 'jn/remote-set-branches'Libravatar Junio C Hamano1-11/+91
2010-06-18Merge branch 'rc/ls-remote-default'Libravatar Junio C Hamano1-1/+9
2010-06-18Merge branch 'tc/merge-m-log'Libravatar Junio C Hamano2-36/+60
2010-06-18Merge branch 'ph/clone-message-reword'Libravatar Junio C Hamano1-1/+2
2010-06-18textconv: support for blameLibravatar Axel Bonnet1-13/+72
2010-06-16Merge 'maint' updates inLibravatar Junio C Hamano1-1/+1
2010-06-16Merge branch 'jn/shortlog' into maintLibravatar Junio C Hamano1-1/+2
2010-06-16Merge branch 'np/index-pack-memsave' into maintLibravatar Junio C Hamano1-44/+45
2010-06-16Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maintLibravatar Junio C Hamano1-4/+45
2010-06-16Merge branch 'np/malloc-threading' into maintLibravatar Junio C Hamano2-3/+12
2010-06-16Merge branch 'mh/status-optionally-refresh' into maintLibravatar Junio C Hamano1-0/+9
2010-06-16format-patch: Add a signature option (--signature)Libravatar Stephen Boyd1-3/+15
2010-06-15notes: Initialize variable to appease Sun StudioLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-06-13Merge branch 'mg/notes-dry-run'Libravatar Junio C Hamano1-4/+9
2010-06-13Merge branch 'rs/grep-binary'Libravatar Junio C Hamano1-2/+6
2010-06-13Merge branch 'js/try-to-free-stackable'Libravatar Junio C Hamano1-2/+4
2010-06-13Merge branch 'jn/maint-amend-missing-name'Libravatar Junio C Hamano1-7/+13
2010-06-13Merge branch 'rs/diff-no-minimal'Libravatar Junio C Hamano4-4/+4
2010-06-13commit: use value of GIT_REFLOG_ACTION env variable as reflog messageLibravatar Christian Couder1-4/+9