summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/pickaxe'Junio C Hamano2006-11-0713-4/+2093
|\
| * git-pickaxe: allow "-L <something>,+N"Junio C Hamano2006-11-071-0/+19
| * git-pickaxe: -L /regexp/,/regexp/Junio C Hamano2006-11-061-13/+83
| * git-pickaxe: optimize by avoiding repeated read_sha1_file().Junio C Hamano2006-11-051-38/+62
| * git-blame: add internal statistics to count read blobs.Junio C Hamano2006-11-051-0/+3
| * git-pickaxe: fix origin refcountingJunio C Hamano2006-11-041-19/+42
| * git-pickaxe: re-scan the blob after making progress with -CJunio C Hamano2006-11-041-62/+103
| * git-pickaxe: re-scan the blob after making progress with -MJunio C Hamano2006-11-041-9/+15
| * git-pickaxe: simplify Octopus merges furtherJunio C Hamano2006-11-041-1/+11
| * git-pickaxe: rename detection optimizationJunio C Hamano2006-11-043-1/+7
| * git-pickaxe: work properly in a subdirectory.Jeff King2006-11-021-4/+11
| * Introduce a new revision set operator <rev>^!Junio C Hamano2006-10-313-3/+55
| * git-pickaxe: cache one already found path per commit.Junio C Hamano2006-10-311-4/+20
| * git-pickaxe: split find_origin() into find_rename() and find_origin().Junio C Hamano2006-10-301-25/+43
| * git-pickaxe: tighten sanity checks.Junio C Hamano2006-10-301-5/+10
| * git-pickaxe: refcount origin correctly in find_copy_in_parent()Junio C Hamano2006-10-291-0/+1
| * git-pickaxe: allow -Ln,m as well as -L n,mJunio C Hamano2006-10-291-2/+8
| * git-pickaxe: WIP to refcount origin structure.Junio C Hamano2006-10-291-21/+121
| * git-pickaxe: swap comparison loop used for -CJunio C Hamano2006-10-211-41/+50
| * git-pickaxe: get rid of wasteful find_origin().Junio C Hamano2006-10-211-37/+101
| * git-pickaxe: do not confuse two origins that are the same.Junio C Hamano2006-10-211-20/+25
| * git-pickaxe: do not keep commit buffer.Junio C Hamano2006-10-201-7/+19
| * git-pickaxe: introduce heuristics to avoid "trivial" chunksJunio C Hamano2006-10-201-4/+32
| * git-pickaxe: improve "best match" heuristicsJunio C Hamano2006-10-201-23/+48
| * git-pickaxe: fix nth_line()Junio C Hamano2006-10-201-0/+3
| * git-pickaxe: pagenate output by default.Junio C Hamano2006-10-201-1/+1
| * git-pickaxe -C: blame cut-and-pasted lines.Junio C Hamano2006-10-202-3/+102
| * git-pickaxe -M: blame line movements within a file.Junio C Hamano2006-10-202-7/+130
| * git-pickaxe: blame rewritten.Junio C Hamano2006-10-198-0/+1314
* | git-pack-objects progress flag documentation and cleanupNicolas Pitre2006-11-072-9/+27
* | Merge branch 'jc/read-tree'Junio C Hamano2006-11-075-60/+244
|\ \
| * | t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano2006-10-271-23/+142
| * | merge-recursive: adjust to loosened "working file clobbered" checkJunio C Hamano2006-10-271-21/+20
| * | merge-recursive: make a few functions static.Junio C Hamano2006-10-271-12/+13
| * | merge-recursive: use abbreviated commit object name.Junio C Hamano2006-10-271-1/+1
| * | merge: loosen overcautious "working file will be lost" check.Junio C Hamano2006-10-273-4/+69
* | | Merge branch 'np/index-pack'Junio C Hamano2006-11-0713-411/+824
|\ \ \
| * | | remove .keep pack lock files when done with refs updateNicolas Pitre2006-11-034-39/+116
| * | | have index-pack create .keep file more carefullyNicolas Pitre2006-11-031-7/+10
| * | | improve fetch-pack's handling of kept packsNicolas Pitre2006-11-035-100/+106
| * | | git-fetch can use both --thin and --keep with fetch-pack nowNicolas Pitre2006-11-031-2/+2
| * | | Teach receive-pack how to keep pack files based on object count.Shawn Pearce2006-11-034-21/+91
| * | | Allow pack header preprocessing before unpack-objects/index-pack.Nicolas Pitre2006-11-032-0/+28
| * | | Merge branch 'master' into np/index-packJunio C Hamano2006-11-0364-722/+1893
| |\ \ \
| * \ \ \ Merge branch 'sp/keep-pack' into np/index-packJunio C Hamano2006-11-0224-342/+600
| |\ \ \ \
| | * | | | Remove unused variable in receive-pack.Shawn Pearce2006-10-301-5/+2
| | * | | | Teach git-index-pack how to keep a pack file.Shawn Pearce2006-10-292-6/+61
| | * | | | Merge early part of branch 'np/index-pack' into sp/keep-packJunio C Hamano2006-10-294-284/+436
| | |\ \ \ \
| | * | | | | Only repack active packs by skipping over kept packs.Shawn Pearce2006-10-291-10/+17
| | * | | | | Allow short pack names to git-pack-objects --unpacked=.Shawn Pearce2006-10-291-1/+19