summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2006-05-09Merge branch 'master' into nextLibravatar Junio C Hamano4-12/+12
2006-05-09Merge branch 'fix'Libravatar Junio C Hamano2-2/+2
2006-05-09checkout: use --aggressive when running a 3-way merge (-m).Libravatar Junio C Hamano1-1/+1
2006-05-09revert/cherry-pick: use aggressive merge.Libravatar Linus Torvalds1-1/+1
2006-05-09Merge branch 'jc/grep' into nextLibravatar Junio C Hamano2-9/+37
2006-05-09builtin-grep: -F (--fixed-strings)Libravatar Junio C Hamano2-5/+33
2006-05-09builtin-grep: -w fixLibravatar Junio C Hamano1-3/+3
2006-05-09builtin-grep: typofixLibravatar Junio C Hamano1-1/+1
2006-05-09Merge branch 'jc/clean'Libravatar Junio C Hamano2-5/+17
2006-05-09Merge branch 'mw/alternates'Libravatar Junio C Hamano3-77/+212
2006-05-09Merge branch 'jc/xsha1'Libravatar Junio C Hamano1-8/+47
2006-05-09Merge branch 'jc/again'Libravatar Junio C Hamano3-4/+142
2006-05-09Merge branch 'np/delta'Libravatar Junio C Hamano5-157/+353
2006-05-09Merge branch 'jc/bindiff'Libravatar Junio C Hamano8-69/+575
2006-05-09Merge branch 'fix'Libravatar Junio C Hamano2-10/+10
2006-05-09Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-26/+50
2006-05-09Merge branch 'ml/cvs' into nextLibravatar Junio C Hamano3-97/+187
2006-05-09Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff...Libravatar Junio C Hamano3-97/+187
2006-05-09read-cache.c: use xcalloc() not calloc()Libravatar Yakov Lerner1-1/+1
2006-05-09apply: fix infinite loop with multiple patches with --indexLibravatar Eric Wong1-9/+9
2006-05-08builtin-grep: tighten argument parsing.Libravatar Junio C Hamano1-26/+50
2006-05-08Merge branch 'jc/clean' into nextLibravatar Junio C Hamano18-46/+64
2006-05-08Merge branch 'jc/bindiff' into nextLibravatar Junio C Hamano1-29/+35
2006-05-08Merge branch 'jc/xsha1' into nextLibravatar Junio C Hamano1-0/+1
2006-05-08Merge branch 'jc/grep' into nextLibravatar Junio C Hamano2-42/+104
2006-05-08Teach git-clean optional <paths>... parameters.Libravatar Junio C Hamano2-5/+17
2006-05-08Merge branch 'fix'Libravatar Junio C Hamano16-41/+47
2006-05-08Separate object name errors from usage errorsLibravatar Dmitry V. Levin13-25/+36
2006-05-08get_sha1() - fix infinite loop on nonexistent stage.Libravatar Junio C Hamano1-0/+1
2006-05-08Documentation: {caret} fixes (git-rev-list.txt)Libravatar Junio C Hamano1-3/+4
2006-05-08builtin-grep: documentationLibravatar Junio C Hamano1-23/+62
2006-05-08Teach -f <file> option to builtin-grep.Libravatar Junio C Hamano1-19/+42
2006-05-08improve base85 generated assembly codeLibravatar Nicolas Pitre1-29/+35
2006-05-08Fix "git diff --stat" with long filenamesLibravatar Linus Torvalds1-1/+1
2006-05-07Fix repo-config set-multivar error return path.Libravatar Junio C Hamano1-12/+6
2006-05-07Merge branch 'jc/gitlink' into nextLibravatar Junio C Hamano7-12/+140
2006-05-07Merge branch 'mw/alternates' into nextLibravatar Junio C Hamano9-91/+306
2006-05-07Merge branch 'jc/cache-tree' into nextLibravatar Junio C Hamano1-2/+2
2006-05-07clone: don't clone the info/alternates fileLibravatar Martin Waitz1-5/+1
2006-05-07test case for transitive info/alternatesLibravatar Martin Waitz1-0/+105
2006-05-07Transitively read alternativesLibravatar Martin Waitz1-72/+106
2006-05-08Change to allow subdir updates from EclipseLibravatar Martyn Smith1-11/+27
2006-05-07Merge branch 'fix'Libravatar Junio C Hamano6-13/+94
2006-05-07Sparse fix for builtin-diffLibravatar Peter Hagervall1-2/+1
2006-05-07repack: honor -d even when no new pack was createdLibravatar Martin Waitz1-7/+7
2006-05-07clone: keep --reference even with -l -sLibravatar Martin Waitz2-1/+79
2006-05-08Many fixes for most operations in Eclipse.Libravatar Martyn Smith1-82/+139
2006-05-07repo-config: document what value_regexp does a bit more clearly.Libravatar Junio C Hamano1-4/+5
2006-05-07Release config lock if the regex is invalidLibravatar Pavel Roskin1-0/+2
2006-05-08Added logged warnings for CVS error returnsLibravatar Martyn Smith1-0/+2