summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/checkout-am-fix-unborn'Junio C Hamano2017-05-232-2/+3
|\
| * am: check return value of resolve_refdup before using hashrs/checkout-am-fix-unbornRené Scharfe2017-05-081-1/+1
| * checkout: check return value of resolve_refdup before using hashRené Scharfe2017-05-081-1/+2
* | Merge branch 'ah/log-decorate-default-to-auto'Junio C Hamano2017-05-231-2/+2
|\ \
| * | builtin/log: honor log.decorateah/log-decorate-default-to-autobrian m. carlson2017-05-151-2/+2
* | | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-1615-48/+48
|\ \ \
| * | | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-2713-36/+36
| * | | PRItime: introduce a new "printf format" for timestampsJohannes Schindelin2017-04-236-9/+9
| * | | parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin2017-04-232-3/+3
* | | | Merge branch 'jn/clone-add-empty-config-from-command-line'Junio C Hamano2017-05-161-1/+3
|\ \ \ \
| * | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-lineJonathan Nieder2017-05-021-1/+3
* | | | | Merge branch 'ab/clone-no-tags'Junio C Hamano2017-05-161-2/+11
|\ \ \ \ \
| * | | | | clone: add a --no-tags option to clone without tagsÆvar Arnfjörð Bjarmason2017-05-011-2/+11
* | | | | | Merge branch 'sk/status-short-branch-color-config'Junio C Hamano2017-05-161-0/+4
|\ \ \ \ \ \
| * | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-configStephen Kent2017-04-281-0/+4
* | | | | | | Merge branch 'jk/am-leakfix'Junio C Hamano2017-05-161-20/+14
|\ \ \ \ \ \ \
| * | | | | | | am: shorten ident_split variable name in get_commit_info()jk/am-leakfixJeff King2017-04-271-11/+9
| * | | | | | | am: simplify allocations in get_commit_info()Jeff King2017-04-271-15/+10
| * | | | | | | am: fix commit buffer leak in get_commit_info()Jeff King2017-04-271-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | 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