summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jh/note-trees-record-blobs'Junio C Hamano2014-03-141-1/+5
|\
| * notes: disallow reusing non-blob as a note objectjh/note-trees-record-blobsJohan Herland2014-02-201-1/+5
* | Merge branch 'nd/no-more-fnmatch'Junio C Hamano2014-03-1410-10/+10
|\ \
| * | use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy2014-02-2010-10/+10
* | | Merge branch 'nd/reset-setup-worktree'Junio C Hamano2014-03-141-3/+4
|\ \ \
| * | | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-181-3/+4
| * | | Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-131-6/+25
| |\ \ \
| * \ \ \ Merge branch 'sb/repack-in-c' into maintJunio C Hamano2014-02-131-12/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-051-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-051-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-051-6/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano2014-02-051-3/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/transport-positive-depth-only' into maintJunio C Hamano2014-02-052-0/+8
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'ks/config-file-stdin'Junio C Hamano2014-03-141-49/+55
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: teach "git config --file -" to read from the standard inputks/config-file-stdinKirill A. Shutemov2014-02-181-0/+11
| * | | | | | | | | | | config: change git_config_with_options() interfaceKirill A. Shutemov2014-02-181-40/+35
| * | | | | | | | | | | builtin/config.c: rename check_blob_write() -> check_write()Kirill A. Shutemov2014-02-181-9/+9
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/janitorial-fixes'Junio C Hamano2014-03-141-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/mv: don't use memory after freeJohn Keeping2014-02-181-1/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jc/check-attr-honor-working-tree'Junio C Hamano2014-03-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | check-attr: move to the top of working tree when in non-bare repositoryjc/check-attr-honor-working-treeJunio C Hamano2014-02-061-0/+3
* | | | | | | | | | | | Merge branch 'cc/starts-n-ends-with-endgame'Junio C Hamano2014-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gj/push-more-verbose-advice'Junio C Hamano2014-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | push: switch default from "matching" to "simple"gj/push-more-verbose-adviceJunio C Hamano2013-11-131-25/+8
* | | | | | | | | | | | | | Merge branch 'jc/add-2.0-ignore-removal'Junio C Hamano2014-03-071-57/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git add <pathspec>... defaults to "-A"jc/add-2.0-ignore-removalJunio C Hamano2013-04-221-39/+4
* | | | | | | | | | | | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec'Junio C Hamano2014-03-071-106/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git add: -u/-A now affects the entire working treejn/add-2.0-u-A-sans-pathspecJunio C Hamano2013-04-261-105/+9
* | | | | | | | | | | | | | | | Merge branch 'jc/push-2.0-default-to-simple'Junio C Hamano2014-03-071-24/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | push: switch default from "matching" to "simple"jc/push-2.0-default-to-simpleJunio C Hamano2013-06-181-24/+7
* | | | | | | | | | | | | | | | | Merge branch 'nd/daemonize-gc'Junio C Hamano2014-03-051-5/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | gc: config option for running --auto in backgroundNguyễn Thái Ngọc Duy2014-02-101-5/+18
* | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-02-273-182/+349
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | pack-bitmap: implement optional name_hash cacheVicent Marti2013-12-301-1/+9
| * | | | | | | | | | | | | | | | | | repack: consider bitmaps when performing repacksVicent Marti2013-12-301-1/+8
| * | | | | | | | | | | | | | | | | | repack: handle optional files created by pack-objectsJeff King2013-12-301-2/+7
| * | | | | | | | | | | | | | | | | | repack: turn exts array into array-of-structJeff King2013-12-301-6/+11
| * | | | | | | | | | | | | | | | | | repack: stop using magic number for ARRAY_SIZE(exts)Jeff King2013-12-301-4/+4
| * | | | | | | | | | | | | | | | | | pack-objects: implement bitmap writingVicent Marti2013-12-301-0/+53
| * | | | | | | | | | | | | | | | | | rev-list: add bitmap mode to speed up object listsVicent Marti2013-12-301-0/+39
| * | | | | | | | | | | | | | | | | | pack-objects: use bitmaps when packing objectsVicent Marti2013-12-301-0/+107
| * | | | | | | | | | | | | | | | | | pack-objects: split add_object_entryJeff King2013-12-301-20/+78
| * | | | | | | | | | | | | | | | | | pack-objects: factor out name_hashVicent Marti2013-10-241-22/+2
| * | | | | | | | | | | | | | | | | | pack-objects: refactor the packing listVicent Marti2013-10-241-135/+40
* | | | | | | | | | | | | | | | | | | Merge branch 'dk/blame-janitorial'Junio C Hamano2014-02-271-51/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | builtin/blame.c::find_copy_in_blob: no need to scan for region enddk/blame-janitorialDavid Kastrup2014-02-251-8/+1
| * | | | | | | | | | | | | | | | | | | blame.c: prepare_lines should not call xrealloc for every lineDavid Kastrup2014-02-241-15/+31
| * | | | | | | | | | | | | | | | | | | builtin/blame.c::prepare_lines: fix allocation size of sb->linenoDavid Kastrup2014-02-241-2/+2
| * | | | | | | | | | | | | | | | | | | builtin/blame.c: eliminate same_suspect()David Kastrup2014-02-241-17/+8
| * | | | | | | | | | | | | | | | | | | builtin/blame.c: struct blame_entry does not need a prev linkDavid Kastrup2014-01-221-11/+2
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |