summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* builtin/log.c: fix minor memory leakmm/log-branch-desc-plug-leakMatthieu Moy2014-08-071-0/+1
* Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-162-8/+6
|\
| * annotate: use argv_arrayRené Scharfe2014-07-161-7/+5
| * enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-021-1/+1
* | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-096-8/+8
|\ \
| * | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-312-4/+4
| * | comments: fix misuses of "nor"Justin Lebar2014-03-314-4/+4
* | | Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-091-0/+1
|\ \ \
| * | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-021-0/+1
* | | | Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-085-17/+38
|\ \ \ \
| * | | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-181-1/+1
| * | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-185-17/+38
| |/ / /
* | | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-031-0/+9
|\ \ \ \
| * | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fixbrian m. carlson2014-03-171-0/+5
| * | | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-111-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-031-2/+2
|\ \ \ \
| * | | | index-pack: report error using the correct variablend/index-pack-error-messageJunio C Hamano2014-03-171-2/+2
| |/ / /
* | | | Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-031-12/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | shallow: automatically clean up shallow tempfilesJeff King2014-02-271-12/+4
| | |/ | |/|
* | | Merge branch 'jk/clean-d-pathspec' into maintJunio 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 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-181-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 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-181-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 'ds/rev-parse-required-args' into maintJunio C Hamano2014-03-181-6/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rev-parse: check i before using argv[i] against argcds/rev-parse-required-argsDavid Sharp2014-01-281-6/+11
* | | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-189-36/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | clean: use cache_name_is_other()nd/submodule-pathspec-ending-with-slashNguyễn Thái Ngọc Duy2014-02-241-19/+2
| * | | | | | | | | | | clean: replace match_pathspec() with dir_path_match()Nguyễn Thái Ngọc Duy2014-02-241-2/+1
| * | | | | | | | | | | pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy2014-02-242-3/+4
| * | | | | | | | | | | pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy2014-02-243-5/+7
| * | | | | | | | | | | pathspec: convert some match_pathspec_depth() to dir_path_match()Nguyễn Thái Ngọc Duy2014-02-243-6/+3
| * | | | | | | | | | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-245-6/+6
* | | | | | | | | | | | Merge branch 'tb/repack-fix-renames' (early part)Junio C Hamano2014-02-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | repack.c: rename and unlink pack file if it existsTorsten Bögershausen2014-02-051-2/+2
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2014-01-271-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | repack: propagate pack-objects options as stringssb/repack-in-cJeff King2014-01-231-11/+11
| * | | | | | | | | | repack: make parsed string options const-correctJeff King2014-01-231-1/+1
| * | | | | | | | | | repack: fix typo in max-pack-size optionJeff King2014-01-231-1/+1
* | | | | | | | | | | Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-271-4/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cmd_init_db(): when creating directories, handle errors conservativelyMichael Haggerty2014-01-061-3/+4
View Lorry Controller Status