summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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 endDavid 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
* | Merge branch 'bc/gpg-sign-everywhere'Junio C Hamano2014-02-271-0/+2
|\ \
| * | cherry-pick, revert: add the --gpg-sign optionNicolas Vigier2014-01-281-0/+2
* | | Merge branch 'nd/reset-intent-to-add'Junio C Hamano2014-02-271-12/+28
|\ \ \
| * | | reset: support "--mixed --intent-to-add" modeNguyễn Thái Ngọc Duy2014-02-061-12/+28
| |/ /
* | | Merge branch 'ep/varscope'Junio C Hamano2014-02-276-18/+21
|\ \ \
| * | | builtin/gc.c: reduce scope of variablesElia Pinto2014-01-311-2/+3
| * | | builtin/fetch.c: reduce scope of variableElia Pinto2014-01-311-1/+1
| * | | builtin/commit.c: reduce scope of variablesElia Pinto2014-01-311-5/+6
| * | | builtin/clean.c: reduce scope of variableElia Pinto2014-01-311-1/+2
| * | | builtin/blame.c: reduce scope of variablesElia Pinto2014-01-311-3/+3
| * | | builtin/apply.c: reduce scope of variablesElia Pinto2014-01-311-6/+6
* | | | Merge branch 'ds/rev-parse-required-args'Junio C Hamano2014-02-271-6/+11
|\ \ \ \
| * | | | rev-parse: check i before using argv[i] against argcDavid Sharp2014-01-281-6/+11
* | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano2014-02-279-36/+18
|\ \ \ \ \
| * | | | | clean: use cache_name_is_other()Nguyễ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 'kb/fast-hashmap'Junio C Hamano2014-02-273-51/+43
|\ \ \ \ \ \
| * | | | | | read-cache.c: fix memory leaks caused by removed cache entriesKarsten Blees2013-11-182-2/+5
| * | | | | | builtin/update-index.c: cleanup update_oneKarsten Blees2013-11-181-21/+15
| * | | | | | fix 'git update-index --verbose --again' outputKarsten Blees2013-11-181-1/+1
| * | | | | | buitin/describe.c: use new hash map implementationKarsten Blees2013-11-181-29/+24
* | | | | | | Merge branch 'nv/commit-gpgsign-config'Junio C Hamano2014-02-273-1/+18
|\ \ \ \ \ \ \
| * | | | | | | commit-tree: add and document --no-gpg-signJunio C Hamano2014-02-241-0/+5
| * | | | | | | commit-tree: add the commit.gpgsign option to sign all commitsNicolas Vigier2014-02-243-1/+13
* | | | | | | | 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 stringsJeff 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
| * | | | | | | safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty2014-01-061-2/+2
* | | | | | | | Merge branch 'ef/mingw-write'Junio C Hamano2014-01-271-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | prefer xwrite instead of writeErik Faye-Lund2014-01-171-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'km/gc-eperm' into maintJunio C Hamano2014-01-131-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maintJunio C Hamano2014-01-131-7/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-double-dashes' into maintJunio C Hamano2014-01-131-1/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/cat-file-regression-fix' into maintJunio C Hamano2014-01-131-10/+20
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'nd/shallow-clone'Junio C Hamano2014-01-177-74/+309
|\ \ \ \ \ \ \ \ \ \ \