summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-08-17Merge branch 'cb/maint-quiet-push'Libravatar Junio C Hamano6-10/+39
2011-08-17Merge branch 'jc/maint-combined-diff-work-tree'Libravatar Junio C Hamano1-4/+10
2011-08-17Merge branch 'cb/maint-exec-error-report'Libravatar Junio C Hamano3-17/+33
2011-08-17Merge branch 'maint'Libravatar Junio C Hamano1-32/+0
2011-08-17Merge branch 'rc/histogram-diff' into HEADLibravatar Junio C Hamano14-285/+655
2011-08-17xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Libravatar Tay Ray Chuan1-36/+50
2011-08-17doc/fast-import: document feature import-marks-if-existsLibravatar Dmitry Ivankov2-3/+54
2011-08-17checkout-index: remove obsolete commentLibravatar Nguyễn Thái Ngọc Duy1-32/+0
2011-08-16Sync with "maint"Libravatar Junio C Hamano1-49/+1
2011-08-16Merge branch 'maint'Libravatar Junio C Hamano2-0/+54
2011-08-16merge-recursive: take advantage of hardcoded empty treeLibravatar Jonathan Nieder1-5/+3
2011-08-16Prepare for 1.7.6.1Libravatar Junio C Hamano2-1/+53
2011-08-16Merge branch 'jk/tag-list-multiple-patterns' into maintLibravatar Junio C Hamano3-12/+28
2011-08-16Merge branch 'jl/submodule-update-quiet' into maintLibravatar Junio C Hamano2-4/+11
2011-08-16Merge branch 'jl/submodule-add-relurl-wo-upstream' into maintLibravatar Junio C Hamano3-11/+15
2011-08-16Merge branch 'oa/pull-reflog' into maintLibravatar Junio C Hamano1-1/+1
2011-08-16Merge branch 'js/ls-tree-error' into maintLibravatar Junio C Hamano2-3/+25
2011-08-16Merge branch 'jk/fast-export-quote-path' into maintLibravatar Junio C Hamano2-8/+51
2011-08-16Merge branch 'jc/checkout-reflog-fix' into maintLibravatar Junio C Hamano1-2/+5
2011-08-16Merge branch 'jc/maint-reset-unmerged-path' into maintLibravatar Junio C Hamano3-2/+18
2011-08-16Merge branch 'mz/doc-rebase-abort' into maintLibravatar Junio C Hamano2-7/+11
2011-08-16Merge branch 'bw/log-all-ref-updates-doc' into maintLibravatar Junio C Hamano2-3/+6
2011-08-16Merge branch 'js/maint-add-path-stat-pwd' into maintLibravatar Junio C Hamano1-1/+2
2011-08-16Merge branch 'ms/help-unknown' into maintLibravatar Junio C Hamano1-0/+12
2011-08-16Merge branch 'mz/doc-synopsis-verse' into maintLibravatar Junio C Hamano93-6/+92
2011-08-16Merge branch 'jn/mime-type-with-params' into maintLibravatar Junio C Hamano1-1/+10
2011-08-16Merge branch 'jc/submodule-sync-no-auto-vivify' into maintLibravatar Junio C Hamano3-30/+47
2011-08-16Merge branch 'jc/zlib-wrap' into maintLibravatar Junio C Hamano15-124/+321
2011-08-16Merge branch 'fk/relink-upon-ldflags-update' into maintLibravatar Junio C Hamano2-8/+18
2011-08-16Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintLibravatar Junio C Hamano2-1/+23
2011-08-16Merge branch 'aw/rebase-i-p' into maintLibravatar Junio C Hamano4-5/+30
2011-08-16Merge branch 'jc/diff-index-quick-exit-early' into maintLibravatar Junio C Hamano3-2/+10
2011-08-16Merge branch 'jk/combine-diff-binary-etc' into maintLibravatar Junio C Hamano5-83/+376
2011-08-16am: refresh the index at start and --resolvedLibravatar Jeff King1-0/+2
2011-08-16revert: plug memory leak in "cherry-pick root commit" codepathLibravatar Jonathan Nieder2-7/+27
2011-08-14Unroll the loop over passesLibravatar Michael Haggerty1-25/+26
2011-08-14Change while loop into for loopLibravatar Michael Haggerty1-4/+1
2011-08-14Determine the start of the states outside of the pass loopLibravatar Michael Haggerty1-3/+5
2011-08-14Change parse_attr() to take a pointer to struct attr_stateLibravatar Michael Haggerty1-6/+11
2011-08-14Increment num_attr in parse_attr_line(), not parse_attr()Libravatar Michael Haggerty1-4/+4
2011-08-14Document struct match_attrLibravatar Michael Haggerty1-0/+14
2011-08-14Add a file commentLibravatar Michael Haggerty1-16/+10
2011-08-14fast-import: prevent producing bad deltaLibravatar Dmitry Ivankov2-6/+31
2011-08-14fast-import: add a test for tree delta base corruptionLibravatar Dmitry Ivankov1-0/+41
2011-08-14merge-recursive: Don't re-sort a list whose order we depend uponLibravatar Elijah Newren1-4/+12
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destLibravatar Elijah Newren2-3/+22
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyLibravatar Elijah Newren1-0/+69
2011-08-14merge-recursive: Avoid unnecessary file rewritesLibravatar Elijah Newren2-9/+27
2011-08-14t6022: Additional tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+91
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesLibravatar Elijah Newren2-15/+21