summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pc/dir-count-slashes'Junio C Hamano2017-06-221-10/+3
|\
| * dir: create function count_slashes()pc/dir-count-slashesPrathamesh 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 commentsjc/diff-tree-stale-commentJunio C Hamano2017-06-021-3/+5
* | | | | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-136-78/+38
|\ \ \ \ \ \ \
| * | | | | | | builtin/fetch.c: respect 'submodule.recurse' optionsb/submodule-blanket-recursiveStefan Beller2017-06-011-0/+7
| * | | | | | | builtin/push.c: respect 'submodule.recurse' optionStefan Beller2017-06-011-0/+4
| * | | | | | | builtin/grep.c: respect 'submodule.recurse' optionStefan Beller2017-06-011-0/+3
| * | | | | | | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-013-3/+19
| * | | | | | | reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller2017-05-303-76/+6
| * | | | | | | submodule recursing: do not write a config variable twiceStefan Beller2017-05-303-3/+3
| * | | | | | | Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursiveJunio C Hamano2017-05-302-5/+22
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge branch 'jc/noent-notdir'Junio C Hamano2017-06-132-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedjc/noent-notdirJunio C Hamano2017-05-302-2/+2
* | | | | | | | | Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano2017-06-051-11/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostashTyler Brazier2017-06-011-11/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'js/blame-lib'Junio C Hamano2017-06-052-2048/+65
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: move entry prepend to libgitJeff Smith2017-05-251-14/+0
| * | | | | | | | | blame: move scoreboard setup to libgitJeff Smith2017-05-251-276/+0
| * | | | | | | | | blame: move scoreboard-related methods to libgitJeff Smith2017-05-251-1318/+0
| * | | | | | | | | blame: move fake-commit-related methods to libgitJeff Smith2017-05-251-197/+0
| * | | | | | | | | blame: move origin-related methods to libgitJeff Smith2017-05-251-72/+0