summaryrefslogtreecommitdiffstats
path: root/builtin
AgeCommit message (Expand)AuthorLines
2010-07-19Merge branch 'jl/add-n-ignore-missing'Junio C Hamano-4/+12
2010-07-16Merge branch 'jc/diff-merge-base-multi'Junio C Hamano-13/+0
2010-07-15Merge branch 'wp/merge-tree-fix'Junio C Hamano-1/+2
2010-07-15Merge branch 'js/merge-rr-fix'Junio C Hamano-1/+1
2010-07-15Merge branch 'jc/diff-merge-base-multi'Junio C Hamano-8/+23
2010-07-15Merge branch 'jn/grep-open'Junio C Hamano-0/+1
2010-07-15Merge branch 'jk/maint-status-keep-index-timestamp'Junio C Hamano-5/+11
2010-07-14MERGE_RR is in .git, not .git/rr-cacheJay Soffian-1/+1
2010-07-14merge-tree: fix where two branches share no changesWill Palmer-1/+2
2010-07-12git add: Add the "--ignore-missing" option for the dry runJens Lehmann-4/+12
2010-07-08Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fixJunio C Hamano-0/+43957
2010-07-07grep -O: Do not pass color sequences as filenames to pagerNazri Ramliy-0/+1
2010-07-07Merge branch 'maint'Junio C Hamano-2/+2
2010-07-07Merge branch 'maint-1.6.4' into maintJunio C Hamano-2/+2
2010-07-07Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano-37/+91
2010-07-06do not write out index when status does not have toJunio C Hamano-5/+11
2010-06-30Merge branch 'ar/decorate-color'Junio C Hamano-0/+3
2010-06-30Merge branch 'cc/cherry-pick-stdin'Junio C Hamano-17/+18
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano-1/+6
2010-06-30Merge branch 'jn/grep-open'Junio C Hamano-26/+95
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano-79/+79
2010-06-30Merge branch 'tr/rev-list-count'Junio C Hamano-0/+16
2010-06-29revert: do not rebuild argv on heapJonathan Nieder-16/+16
2010-06-28Merge branch 'maint'Junio C Hamano-0/+4
2010-06-28notes: check number of parameters to "git notes copy"Jeff King-0/+4
2010-06-27Merge branch 'cp/textconv-cat-file'Junio C Hamano-8/+38
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano-13/+72
2010-06-27Merge branch 'jp/string-list-api-cleanup' into jn/grep-openJulian Phillips-82/+82
2010-06-27string_list: Fix argument order for string_list_appendJulian Phillips-52/+52
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips-4/+4
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips-13/+13
2010-06-27string_list: Fix argument order for for_each_string_listJulian Phillips-10/+10
2010-06-25Merge branch 'maint'Junio C Hamano-1/+1
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann-1/+6
2010-06-25revert: accept arbitrary rev-list optionsChristian Couder-1/+2
2010-06-24Allow customizable commit decorations colorsNazri Ramliy-0/+3
2010-06-24msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones-1/+1
2010-06-22Merge branch 'sb/format-patch-signature'Junio C Hamano-3/+15
2010-06-22Merge branch 'cc/cherry-pick-series'Junio C Hamano-41/+79
2010-06-22Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano-4/+9
2010-06-22Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano-0/+7
2010-06-22Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano-6/+4
2010-06-22Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano-34/+41
2010-06-22Merge branch 'tc/merge-m-log' into maintJunio C Hamano-36/+60
2010-06-22Merge branch 'ph/clone-message-reword' into maintJunio C Hamano-1/+2
2010-06-22Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano-7/+13
2010-06-22Merge branch 'pc/remove-warn' into maintJunio C Hamano-5/+1
2010-06-21Merge branch 'cc/maint-commit-reflog-msg'Junio C Hamano-4/+9
2010-06-21Merge branch 'jk/maint-advice-empty-amend'Junio C Hamano-0/+7
2010-06-21Merge branch 'sm/branch-broken-ref'Junio C Hamano-6/+22