summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2011-05-16Merge branch 'vr/merge-base-doc' into maintLibravatar Junio C Hamano1-1/+2
2011-05-16Merge branch 'jc/fix-add-u-unmerged' into maintLibravatar Junio C Hamano1-22/+23
2011-05-16Merge branch 'jc/maint-branch-mergeoptions' into maintLibravatar Junio C Hamano1-15/+26
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintLibravatar Junio C Hamano1-3/+6
2011-05-15Merge branch 'cn/format-patch-quiet' into maintLibravatar Junio C Hamano1-6/+10
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesLibravatar Jonathan Nieder1-2/+2
2011-05-13Merge branch 'js/blame-parsename' into maintLibravatar Junio C Hamano1-1/+1
2011-05-04Merge branch 'jc/pack-objects-bigfile' into maintLibravatar Junio C Hamano1-2/+6
2011-05-04Merge branch 'mg/reflog-with-options' into maintLibravatar Junio C Hamano1-13/+17
2011-04-29"add -p": work-around an old laziness that does not coalesce hunksLibravatar Junio C Hamano1-3/+6
2011-04-29blame: tolerate bogus e-mail addresses a bit betterLibravatar Josh Stone1-1/+1
2011-04-23Fix "add -u" that sometimes fails to resolve unmerged pathsLibravatar Junio C Hamano1-22/+23
2011-04-15Documentation: update to git-merge-base --octopusLibravatar Vincent van Ravesteijn1-1/+2
2011-04-13revert: Hide '-r' option in default usageLibravatar Ramkumar Ramachandra1-1/+2
2011-04-12format-patch: don't pass on the --quiet flagLibravatar Carlos Martín Nieto1-6/+10
2011-04-06Merge branch 'jk/maint-remote-mirror-safer'Libravatar Junio C Hamano1-13/+49
2011-04-05Teach core.bigfilethreashold to pack-objectsLibravatar Junio C Hamano1-2/+6
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Libravatar Junio C Hamano1-12/+36
2011-04-03Merge branch 'jc/index-update-if-able' into maintLibravatar Junio C Hamano2-13/+3
2011-04-03Merge branch 'lt/default-abbrev' into maintLibravatar Junio C Hamano1-1/+5
2011-04-03Merge branch 'mm/maint-log-n-with-diff-filtering' into maintLibravatar Junio C Hamano1-1/+7
2011-04-03Merge branch 'lp/config-vername-check' into maintLibravatar Junio C Hamano1-7/+20
2011-04-03sparse: Fix errors and silence warningsLibravatar Stephen Boyd3-5/+5
2011-04-01Merge branch 'nd/init-gitdir'Libravatar Junio C Hamano2-4/+72
2011-04-01Merge branch 'jc/merge-sans-branch'Libravatar Junio C Hamano1-2/+40
2011-04-01Merge branch 'jr/grep-en-config'Libravatar Junio C Hamano1-0/+13
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano24-661/+694
2011-04-01Merge branch 'jk/pull-into-empty'Libravatar Junio C Hamano1-1/+1
2011-04-01Merge branch 'jc/maint-apply-report-offset' into maintLibravatar Junio C Hamano1-2/+14
2011-04-01Merge branch 'jc/maint-apply-no-double-patch' into maintLibravatar Junio C Hamano1-1/+6
2011-04-01Merge "checkout ambiguous ref bugfix" into maintLibravatar Junio C Hamano1-10/+13
2011-04-01reflog: fix overriding of command line optionsLibravatar Michael J Gruber1-7/+2
2011-04-01builtin/log.c: separate default and setup of cmd_log_init()Libravatar Michael J Gruber1-6/+15
2011-03-30remote: deprecate --mirrorLibravatar Jeff King1-1/+7
2011-03-30remote: separate the concept of push and fetch mirrorsLibravatar Jeff King1-13/+38
2011-03-30remote: disallow some nonsensical option combinationsLibravatar Jeff King1-0/+5
2011-03-30grep: allow -E and -n to be turned on by default via configurationLibravatar Joe Ratterman1-0/+13
2011-03-29Merge branch 'jc/fetch-progressive-stride'Libravatar Junio C Hamano1-4/+5
2011-03-29Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-pack-sto...Libravatar Junio C Hamano1-1/+2
2011-03-29Revert two "no-done" revertsLibravatar Junio C Hamano1-3/+15
2011-03-29Fix potential local deadlock during fetch-packLibravatar Junio C Hamano1-4/+5
2011-03-29enable "no-done" extension only when fetching over smart-httpLibravatar Junio C Hamano1-1/+2
2011-03-28Revert "fetch-pack: Implement no-done capability"Libravatar Junio C Hamano1-15/+3
2011-03-28Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2011-03-28grep: Add the option '--line-number'Libravatar Joe Ratterman1-1/+1
2011-03-26Merge branch 'mg/rev-list-n-parents'Libravatar Junio C Hamano3-1/+9
2011-03-26Merge branch 'js/remove-unused-variables'Libravatar Junio C Hamano2-6/+1
2011-03-26Merge branch 'jc/index-update-if-able'Libravatar Junio C Hamano2-13/+3
2011-03-26Merge branch 'jk/checkout-orphan-warning'Libravatar Junio C Hamano1-1/+17
2011-03-26Merge branch 'jc/fetch-progressive-stride'Libravatar Junio C Hamano1-3/+18