summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ja/i18n-cleanup'Junio C Hamano2017-05-041-6/+6
|\
| * i18n: remove i18n from tag reflog messageJean-Noel Avila2017-05-011-6/+6
* | Merge branch 'jk/submodule-init-segv-fix'Junio C Hamano2017-05-011-3/+3
|\ \ | |/ |/|
| * submodule_init: die cleanly on submodules without url definedjk/submodule-init-segv-fixJeff King2017-04-241-3/+3
* | Merge branch 'nd/worktree-add-lock'Junio C Hamano2017-04-261-4/+11
|\ \
| * | worktree add: add --lock optionnd/worktree-add-lockNguyễn Thái Ngọc Duy2017-04-201-4/+11
* | | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-266-20/+17
|\ \ \
| * | | am: drop "dir" parameter from am_state_initjk/war-on-git-pathJeff King2017-04-201-6/+4
| * | | replace strbuf_addstr(git_path()) with git_path_buf()Jeff King2017-04-201-4/+2
| * | | replace xstrdup(git_path(...)) with git_pathdup(...)Jeff King2017-04-201-2/+3
| * | | use git_path_* helper functionsJeff King2017-04-202-5/+5
| * | | branch: add edit_description() helperJeff King2017-04-201-3/+3
* | | | Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano2017-04-261-9/+12
|\ \ \ \
| * | | | config: prepare to pass more info in git_config_with_options()Nguyễn Thái Ngọc Duy2017-04-171-9/+12
* | | | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-261-21/+18
|\ \ \ \ \
| * | | | | builtin/am: fold am_signoff() into am_append_signoff()Giuseppe Bilotta2017-04-161-18/+15
| * | | | | builtin/am: honor --signoff also when --rebasingGiuseppe Bilotta2017-04-161-3/+3
* | | | | | Merge branch 'dt/xgethostname-nul-termination'Junio C Hamano2017-04-232-6/+10
|\ \ \ \ \ \
| * | | | | | xgethostname: handle long hostnamesdt/xgethostname-nul-terminationDavid Turner2017-04-182-2/+2
| * | | | | | use HOST_NAME_MAX to size buffers for gethostname(2)René Scharfe2017-04-182-4/+8
* | | | | | | Merge branch 'jk/ls-files-recurse-submodules-fix'Junio C Hamano2017-04-231-1/+8
|\ \ \ \ \ \ \
| * | | | | | | ls-files: fix path used when recursing into submodulesjk/ls-files-recurse-submodules-fixJacob Keller2017-04-181-1/+4
| * | | | | | | ls-files: fix recurse-submodules with nested submodulesJacob Keller2017-04-171-0/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs/misc-cppcheck-fixes'Junio C Hamano2017-04-231-2/+6
|\ \ \ \ \ \ \
| * | | | | | | am: close stream on error, but not stdinRené Scharfe2017-04-161-2/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/snprintf-cleanups'Junio C Hamano2017-04-231-0/+1
|\ \ \ \ \ \ \
| * | | | | | | replace: plug a memory leakjk/snprintf-cleanupsJunio C Hamano2017-04-171-0/+1
* | | | | | | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2017-04-231-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | receive-pack: drop tmp_objdir_env from run_update_hookJeff King2017-04-161-1/+0
* | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano2017-04-231-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | read-cache: force_verify_index_checksumJeff Hostetler2017-04-151-0/+1
* | | | | | | | | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-04-232-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | path.c: and an option to call real_path() in expand_user_path()Nguyễn Thái Ngọc Duy2017-04-142-2/+2
* | | | | | | | | | | Merge branch 'ab/grep-plug-pathspec-leak'Junio C Hamano2017-04-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | grep: plug a trivial memory leakab/grep-plug-pathspec-leakÆvar Arnfjörð Bjarmason2017-04-161-0/+1
* | | | | | | | | | | | Merge branch 'nd/files-backend-git-dir'Junio C Hamano2017-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | refs: delete pack_refs() in favor of refs_pack_refs()Nguyễn Thái Ngọc Duy2017-04-141-1/+1
* | | | | | | | | | | | | Merge branch 'bw/submodule-is-active'Junio C Hamano2017-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule--helper: fix typo in is_active error messagebw/submodule-is-activeStefan Beller2017-04-131-1/+1
* | | | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules'Junio C Hamano2017-04-192-2/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | submodule--helper: add push-check subcommandBrandon Williams2017-04-111-0/+45
| * | | | | | | | | | | | | | push: unmark a local variable as staticBrandon Williams2017-04-021-2/+3
* | | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-04-1914-169/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Rename sha1_array to oid_arraybrian m. carlson2017-03-317-31/+31
| * | | | | | | | | | | | | | Convert sha1_array_for_each_unique and for_each_abbrev to object_idbrian m. carlson2017-03-313-10/+10
| * | | | | | | | | | | | | | Convert sha1_array_lookup to take struct object_idbrian m. carlson2017-03-311-1/+1
| * | | | | | | | | | | | | | Convert remaining callers of sha1_array_lookup to object_idbrian m. carlson2017-03-311-8/+8
| * | | | | | | | | | | | | | Make sha1_array_append take a struct object_id *brian m. carlson2017-03-315-9/+9
| * | | | | | | | | | | | | | sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson2017-03-282-13/+13
| * | | | | | | | | | | | | | builtin/pull: convert to struct object_idbrian m. carlson2017-03-281-36/+36