summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dd/use-alloc-grow'Junio C Hamano2014-03-182-10/+4
|\
| * builtin/mktree.c: use ALLOC_GROW() in append_to_tree()Dmitry S. Dolzhenko2014-03-031-4/+1
| * builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()Dmitry S. Dolzhenko2014-03-031-6/+3
* | Merge branch 'jk/clean-d-pathspec'Junio C Hamano2014-03-181-11/+9
|\ \
| * | clean: simplify dir/not-dir logicjk/clean-d-pathspecJeff King2014-03-111-9/+6
| * | clean: respect pathspecs with "-d"Jeff King2014-03-111-2/+3
* | | Merge branch 'sh/write-pack-file-warning-message-fix'Junio C Hamano2014-03-141-1/+1
|\ \ \
| * | | write_pack_file: use correct variable in diagnosticsh/write-pack-file-warning-message-fixSun He2014-03-031-1/+1
* | | | Merge branch 'mh/replace-refs-variable-rename'Junio C Hamano2014-03-146-6/+6
|\ \ \ \
| * | | | rename read_replace_refs to check_replace_refsMichael Haggerty2014-02-206-6/+6
| | |_|/ | |/| |
* | | | Merge branch 'nd/i18n-progress'Junio C Hamano2014-03-145-9/+9
|\ \ \ \
| * | | | i18n: mark all progress lines for translationnd/i18n-progressNguyễn Thái Ngọc Duy2014-02-245-9/+9
| |/ / /
* | | | 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
View Lorry Controller Status