summaryrefslogtreecommitdiffstats
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/config-h'Junio C Hamano2017-06-2478-11/+93
|\
| * config: don't implicitly use gitdir or commondirBrandon Williams2017-06-151-11/+15
| * config: don't include config.h by defaultBrandon Williams2017-06-1578-0/+78
* | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-242-80/+101
|\ \
| * | ls-files: factor out tag calculationBrandon Williams2017-06-131-16/+25
| * | ls-files: factor out debug info into a functionBrandon Williams2017-06-131-9/+14
| * | ls-files: convert show_files to take an indexBrandon Williams2017-06-131-15/+15
| * | ls-files: convert show_ce_entry to take an indexBrandon Williams2017-06-131-5/+6
| * | ls-files: convert prune_cache to take an indexBrandon Williams2017-06-131-7/+8
| * | ls-files: convert ce_excluded to take an indexBrandon Williams2017-06-131-4/+5
| * | ls-files: convert show_ru_info to take an indexBrandon Williams2017-06-131-4/+4
| * | ls-files: convert show_other_files to take an indexBrandon Williams2017-06-131-3/+4
| * | ls-files: convert show_killed_files to take an indexBrandon Williams2017-06-131-10/+11
| * | ls-files: convert write_eolinfo to take an indexBrandon Williams2017-06-131-7/+6
| * | ls-files: convert overlay_tree_on_cache to take an indexBrandon Williams2017-06-132-8/+10
| * | tree: convert read_tree to take an index parameterBrandon Williams2017-06-131-1/+1
| * | convert: convert get_cached_convert_stats_ascii to take an indexBrandon Williams2017-06-131-1/+2
* | | Merge branch 'pc/dir-count-slashes'Junio C Hamano2017-06-221-10/+3
|\ \ \
| * | | dir: create function count_slashes()Prathamesh Chavan2017-06-121-10/+3
| | |/ | |/|
* | | Merge branch 'jk/consistent-h'Junio C Hamano2017-06-199-8/+28
|\ \ \
| * | | diff- and log- family: handle "git cmd -h" earlyJunio C Hamano2017-06-054-0/+12
| * | | submodule--helper: show usage for "-h"Jeff King2017-05-301-3/+2
| * | | remote-{ext,fd}: print usage message on invalid argumentsJeff King2017-05-302-2/+8
| * | | upload-archive: handle "-h" option earlyJeff King2017-05-301-1/+4
| * | | credential: handle invalid arguments earlierJeff King2017-05-301-2/+2
* | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-199-104/+100
|\ \ \ \
| * | | | builtin/diff-tree: cleanup references to sha1Brandon Williams2017-06-051-5/+3
| * | | | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-056-22/+20
| * | | | notes-merge: convert notes_merge* to struct object_idBrandon Williams2017-06-051-3/+3
| * | | | tree-diff: convert diff_root_tree_sha1 to struct object_idBrandon Williams2017-06-021-2/+2
| * | | | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-021-1/+1
| * | | | patch-ids: convert to struct object_idBrandon Williams2017-06-021-1/+1
| * | | | diff: convert fill_filespec to struct object_idBrandon Williams2017-06-022-3/+3
| * | | | grep: convert to struct object_idBrandon Williams2017-06-021-11/+11
| * | | | notes: convert some accessor functions to struct object_idbrian m. carlson2017-06-021-10/+10
| * | | | builtin/notes: convert to struct object_idbrian m. carlson2017-06-023-57/+57
| * | | | notes: make get_note return pointer to struct object_idbrian m. carlson2017-06-021-11/+11
| * | | | notes: convert for_each_note to struct object_idbrian m. carlson2017-06-021-3/+3
* | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-191-3/+13
|\ \ \ \ \
| * | | | | grep: skip pthreads overhead when using one threadÆvar Arnfjörð Bjarmason2017-05-261-0/+2
| * | | | | grep: don't redundantly compile throwaway patterns under threadingÆvar Arnfjörð Bjarmason2017-05-261-3/+11
* | | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-139-25/+17
|\ \ \ \ \ \
| * | | | | | log: fix memory leak in open_next_file()Nguyễn Thái Ngọc Duy2017-05-261-4/+8
| * | | | | | print errno when reporting a system call errorNguyễn Thái Ngọc Duy2017-05-261-1/+2
| * | | | | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-261-1/+1
| * | | | | | clone: use xfopen() instead of fopen()Nguyễn Thái Ngọc Duy2017-05-261-1/+1
| * | | | | | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-266-20/+7
* | | | | | | Merge branch 'jc/diff-tree-stale-comment'Junio C Hamano2017-06-131-3/+5
|\ \ \ \ \ \ \
| * | | | | | | diff-tree: update stale in-code commentsJunio C Hamano2017-06-021-3/+5
* | | | | | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-136-78/+38
|\ \ \ \ \ \ \ \