summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2017-06-04Merge branch 'jk/am-leakfix' into maintLibravatar Junio C Hamano1-20/+14
2017-06-04Merge branch 'jc/read-tree-empty-with-m' into maintLibravatar Junio C Hamano1-1/+1
2017-06-04Merge branch 'ja/do-not-ask-needless-questions' into maintLibravatar Junio C Hamano3-7/+8
2017-06-04Merge branch 'ah/log-decorate-default-to-auto' into maintLibravatar Junio C Hamano1-2/+2
2017-05-15builtin/log: honor log.decorateLibravatar brian m. carlson1-2/+2
2017-05-12read-tree -m: make error message for merging 0 trees less smart aleckLibravatar Jean-Noel Avila1-2/+3
2017-05-12usability: don't ask questions if no reply is requiredLibravatar Jean-Noel Avila2-5/+5
2017-05-10read-tree: "read-tree -m --empty" does not make senseLibravatar Junio C Hamano1-1/+1
2017-05-04Merge branch 'ja/i18n-cleanup'Libravatar Junio C Hamano1-6/+6
2017-05-01Merge branch 'jk/submodule-init-segv-fix'Libravatar Junio C Hamano1-3/+3
2017-05-01i18n: remove i18n from tag reflog messageLibravatar Jean-Noel Avila1-6/+6
2017-04-27am: shorten ident_split variable name in get_commit_info()Libravatar Jeff King1-11/+9
2017-04-27am: simplify allocations in get_commit_info()Libravatar Jeff King1-15/+10
2017-04-27am: fix commit buffer leak in get_commit_info()Libravatar Jeff King1-0/+1
2017-04-26Merge branch 'nd/worktree-add-lock'Libravatar Junio C Hamano1-4/+11
2017-04-26Merge branch 'jk/war-on-git-path'Libravatar Junio C Hamano6-20/+17
2017-04-26Merge branch 'nd/conditional-config-in-early-config'Libravatar Junio C Hamano1-9/+12
2017-04-26Merge branch 'gb/rebase-signoff'Libravatar Junio C Hamano1-21/+18
2017-04-24submodule_init: die cleanly on submodules without url definedLibravatar Jeff King1-3/+3
2017-04-23Merge branch 'dt/xgethostname-nul-termination'Libravatar Junio C Hamano2-6/+10
2017-04-23Merge branch 'jk/ls-files-recurse-submodules-fix'Libravatar Junio C Hamano1-1/+8
2017-04-23Merge branch 'rs/misc-cppcheck-fixes'Libravatar Junio C Hamano1-2/+6
2017-04-23Merge branch 'jk/snprintf-cleanups'Libravatar Junio C Hamano1-0/+1
2017-04-23Merge branch 'jk/quarantine-received-objects'Libravatar Junio C Hamano1-1/+0
2017-04-23Merge branch 'jh/verify-index-checksum-only-in-fsck'Libravatar Junio C Hamano1-0/+1
2017-04-23Merge branch 'nd/conditional-config-include'Libravatar Junio C Hamano2-2/+2
2017-04-20am: drop "dir" parameter from am_state_initLibravatar Jeff King1-6/+4
2017-04-20replace strbuf_addstr(git_path()) with git_path_buf()Libravatar Jeff King1-4/+2
2017-04-20replace xstrdup(git_path(...)) with git_pathdup(...)Libravatar Jeff King1-2/+3
2017-04-20use git_path_* helper functionsLibravatar Jeff King2-5/+5
2017-04-20branch: add edit_description() helperLibravatar Jeff King1-3/+3
2017-04-20worktree add: add --lock optionLibravatar Nguyễn Thái Ngọc Duy1-4/+11
2017-04-19Merge branch 'ab/grep-plug-pathspec-leak'Libravatar Junio C Hamano1-0/+1
2017-04-19Merge branch 'nd/files-backend-git-dir'Libravatar Junio C Hamano1-1/+1
2017-04-19Merge branch 'bw/submodule-is-active'Libravatar Junio C Hamano1-1/+1
2017-04-19Merge branch 'bw/push-options-recursively-to-submodules'Libravatar Junio C Hamano2-2/+48
2017-04-19Merge branch 'bc/object-id'Libravatar Junio C Hamano14-169/+169
2017-04-18xgethostname: handle long hostnamesLibravatar David Turner2-2/+2
2017-04-18use HOST_NAME_MAX to size buffers for gethostname(2)Libravatar René Scharfe2-4/+8
2017-04-18ls-files: fix path used when recursing into submodulesLibravatar Jacob Keller1-1/+4
2017-04-17replace: plug a memory leakLibravatar Junio C Hamano1-0/+1
2017-04-17config: prepare to pass more info in git_config_with_options()Libravatar Nguyễn Thái Ngọc Duy1-9/+12
2017-04-17ls-files: fix recurse-submodules with nested submodulesLibravatar Jacob Keller1-0/+4
2017-04-16Merge branch 'js/difftool-builtin'Libravatar Junio C Hamano1-18/+20
2017-04-16Merge branch 'jk/loose-object-info-report-error'Libravatar Junio C Hamano1-0/+2
2017-04-16Merge branch 'jk/snprintf-cleanups'Libravatar Junio C Hamano11-96/+99
2017-04-16am: close stream on error, but not stdinLibravatar René Scharfe1-2/+6
2017-04-16builtin/am: fold am_signoff() into am_append_signoff()Libravatar Giuseppe Bilotta1-18/+15
2017-04-16builtin/am: honor --signoff also when --rebasingLibravatar Giuseppe Bilotta1-3/+3
2017-04-16receive-pack: drop tmp_objdir_env from run_update_hookLibravatar Jeff King1-1/+0