summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2011-05-19Merge branch 'jk/cherry-pick-root-with-resolve'Libravatar Junio C Hamano2-5/+11
2011-05-16Merge branch 'ci/commit--interactive-atomic'Libravatar Junio C Hamano2-15/+37
2011-05-16Merge branch 'mg/merge-ff-config'Libravatar Junio C Hamano1-0/+9
2011-05-16revert: allow reverting a root commitLibravatar Jeff King1-3/+1
2011-05-16cherry-pick: handle root commits with external strategiesLibravatar Jeff King1-2/+10
2011-05-15Merge branch 'cn/format-patch-quiet' into maintLibravatar Junio C Hamano1-6/+10
2011-05-14Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesLibravatar Jonathan Nieder1-2/+2
2011-05-13Merge branch 'bf/commit-template-no-cleanup'Libravatar Junio C Hamano1-1/+3
2011-05-13Merge branch 'rr/rerere-libify-clear-gc'Libravatar Junio C Hamano1-75/+2
2011-05-13Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Libravatar Junio C Hamano1-0/+5
2011-05-13Merge branch 'jc/fix-add-u-unmerged'Libravatar Junio C Hamano1-22/+23
2011-05-13Merge branch 'cn/log-parse-opt'Libravatar Junio C Hamano1-30/+44
2011-05-13Merge branch 'js/blame-parsename' into maintLibravatar Junio C Hamano1-1/+1
2011-05-11Merge branch 'jc/maint-branch-mergeoptions'Libravatar Junio C Hamano1-15/+26
2011-05-11Merge branch 'jc/maint-add-p-overlapping-hunks'Libravatar Junio C Hamano1-3/+6
2011-05-11Do not strip empty lines / trailing spaces from a commit message templateLibravatar Boris Faure1-1/+3
2011-05-09Add support for -p/--patch to git-commitLibravatar Conrad Irwin2-6/+10
2011-05-09Allow git commit --interactive with pathsLibravatar Conrad Irwin1-2/+0
2011-05-08rerere: libify rerere_clear() and rerere_gc()Libravatar Junio C Hamano1-75/+2
2011-05-08Use a temporary index for git commit --interactiveLibravatar Conrad Irwin1-8/+28
2011-05-06merge: introduce merge.ff configuration variableLibravatar Junio C Hamano1-0/+9
2011-05-06Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-configLibravatar Junio C Hamano1-15/+26
2011-05-06Merge branch 'js/blame-parsename'Libravatar Junio C Hamano1-1/+1
2011-05-06Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano5-17/+26
2011-05-04Merge branch 'mg/rev-list-count-cherry'Libravatar Junio C Hamano1-2/+8
2011-05-04Merge branch 'vr/merge-base-doc'Libravatar Junio C Hamano1-1/+2
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-05-02Merge branch 'jk/notes-ui-updates'Libravatar Junio C Hamano1-10/+0
2011-05-02Merge branch 'ab/i18n-fixup'Libravatar Junio C Hamano4-20/+32
2011-05-02Merge branch 'jh/notes-add-ui'Libravatar Junio C Hamano1-3/+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-28Merge branch 'jc/rename-degrade-cc-to-c'Libravatar Junio C Hamano3-4/+21
2011-04-27Merge branch 'cn/format-patch-quiet'Libravatar Junio C Hamano1-6/+10
2011-04-27Merge branch 'jc/merge-dash-previous'Libravatar Junio C Hamano1-3/+6
2011-04-27Merge branch 'rj/sparse'Libravatar Junio C Hamano3-6/+2
2011-04-27Merge branch 'nk/blame-abbrev'Libravatar Junio C Hamano1-1/+8
2011-04-27Merge branch 'dm/color-palette'Libravatar Junio C Hamano1-13/+3
2011-04-27Merge branch 'jc/pack-objects-bigfile'Libravatar Junio C Hamano1-2/+6
2011-04-27Merge branch 'mg/reflog-with-options'Libravatar Junio C Hamano1-13/+17
2011-04-26rev-list --count: separate count for --cherry-markLibravatar Michael J Gruber1-2/+8
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-14log: convert to parse-optionsLibravatar Carlos Martín Nieto1-30/+43
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-12i18n: mark init-db messages for translationLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2011-04-12i18n: mark checkout plural warning for translationLibravatar Ævar Arnfjörð Bjarmason1-3/+15