Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/checkout-am-fix-unborn' | Junio C Hamano | 2017-05-23 | 2 | -2/+3 |
|\ | |||||
| * | am: check return value of resolve_refdup before using hashrs/checkout-am-fix-unborn | René Scharfe | 2017-05-08 | 1 | -1/+1 |
| * | checkout: check return value of resolve_refdup before using hash | René Scharfe | 2017-05-08 | 1 | -1/+2 |
* | | Merge branch 'ah/log-decorate-default-to-auto' | Junio C Hamano | 2017-05-23 | 1 | -2/+2 |
|\ \ | |||||
| * | | builtin/log: honor log.decorateah/log-decorate-default-to-auto | brian m. carlson | 2017-05-15 | 1 | -2/+2 |
* | | | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 | 15 | -48/+48 |
|\ \ \ | |||||
| * | | | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 | 13 | -36/+36 |
| * | | | PRItime: introduce a new "printf format" for timestamps | Johannes Schindelin | 2017-04-23 | 6 | -9/+9 |
| * | | | parse_timestamp(): specify explicitly where we parse timestamps | Johannes Schindelin | 2017-04-23 | 2 | -3/+3 |
* | | | | Merge branch 'jn/clone-add-empty-config-from-command-line' | Junio C Hamano | 2017-05-16 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-line | Jonathan Nieder | 2017-05-02 | 1 | -1/+3 |
* | | | | | Merge branch 'ab/clone-no-tags' | Junio C Hamano | 2017-05-16 | 1 | -2/+11 |
|\ \ \ \ \ | |||||
| * | | | | | clone: add a --no-tags option to clone without tags | Ævar Arnfjörð Bjarmason | 2017-05-01 | 1 | -2/+11 |
* | | | | | | Merge branch 'sk/status-short-branch-color-config' | Junio C Hamano | 2017-05-16 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-config | Stephen Kent | 2017-04-28 | 1 | -0/+4 |
* | | | | | | | Merge branch 'jk/am-leakfix' | Junio C Hamano | 2017-05-16 | 1 | -20/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | am: shorten ident_split variable name in get_commit_info()jk/am-leakfix | Jeff King | 2017-04-27 | 1 | -11/+9 |
| * | | | | | | | am: simplify allocations in get_commit_info() | Jeff King | 2017-04-27 | 1 | -15/+10 |
| * | | | | | | | am: fix commit buffer leak in get_commit_info() | Jeff King | 2017-04-27 | 1 | -0/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ja/i18n-cleanup' | Junio C Hamano | 2017-05-04 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | i18n: remove i18n from tag reflog message | Jean-Noel Avila | 2017-05-01 | 1 | -6/+6 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/submodule-init-segv-fix' | Junio C Hamano | 2017-05-01 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | submodule_init: die cleanly on submodules without url definedjk/submodule-init-segv-fix | Jeff King | 2017-04-24 | 1 | -3/+3 |
* | | | | | | | Merge branch 'nd/worktree-add-lock' | Junio C Hamano | 2017-04-26 | 1 | -4/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | worktree add: add --lock optionnd/worktree-add-lock | Nguyễn Thái Ngọc Duy | 2017-04-20 | 1 | -4/+11 |
* | | | | | | | | Merge branch 'jk/war-on-git-path' | Junio C Hamano | 2017-04-26 | 6 | -20/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | am: drop "dir" parameter from am_state_initjk/war-on-git-path | Jeff King | 2017-04-20 | 1 | -6/+4 |
| * | | | | | | | | replace strbuf_addstr(git_path()) with git_path_buf() | Jeff King | 2017-04-20 | 1 | -4/+2 |
| * | | | | | | | | replace xstrdup(git_path(...)) with git_pathdup(...) | Jeff King | 2017-04-20 | 1 | -2/+3 |
| * | | | | | | | | use git_path_* helper functions | Jeff King | 2017-04-20 | 2 | -5/+5 |
| * | | | | | | | | branch: add edit_description() helper | Jeff King | 2017-04-20 | 1 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/conditional-config-in-early-config' | Junio C Hamano | 2017-04-26 | 1 | -9/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: prepare to pass more info in git_config_with_options() | Nguyễn Thái Ngọc Duy | 2017-04-17 | 1 | -9/+12 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'gb/rebase-signoff' | Junio C Hamano | 2017-04-26 | 1 | -21/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin/am: fold am_signoff() into am_append_signoff() | Giuseppe Bilotta | 2017-04-16 | 1 | -18/+15 |
| * | | | | | | | | builtin/am: honor --signoff also when --rebasing | Giuseppe Bilotta | 2017-04-16 | 1 | -3/+3 |
* | | | | | | | | | Merge branch 'dt/xgethostname-nul-termination' | Junio C Hamano | 2017-04-23 | 2 | -6/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | xgethostname: handle long hostnamesdt/xgethostname-nul-termination | David Turner | 2017-04-18 | 2 | -2/+2 |
| * | | | | | | | | | use HOST_NAME_MAX to size buffers for gethostname(2) | René Scharfe | 2017-04-18 | 2 | -4/+8 |
* | | | | | | | | | | Merge branch 'jk/ls-files-recurse-submodules-fix' | Junio C Hamano | 2017-04-23 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | ls-files: fix path used when recursing into submodulesjk/ls-files-recurse-submodules-fix | Jacob Keller | 2017-04-18 | 1 | -1/+4 |
| * | | | | | | | | | | ls-files: fix recurse-submodules with nested submodules | Jacob Keller | 2017-04-17 | 1 | -0/+4 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs/misc-cppcheck-fixes' | Junio C Hamano | 2017-04-23 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | am: close stream on error, but not stdin | René Scharfe | 2017-04-16 | 1 | -2/+6 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/snprintf-cleanups' | Junio C Hamano | 2017-04-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | replace: plug a memory leakjk/snprintf-cleanups | Junio C Hamano | 2017-04-17 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'jk/quarantine-received-objects' | Junio C Hamano | 2017-04-23 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | receive-pack: drop tmp_objdir_env from run_update_hook | Jeff King | 2017-04-16 | 1 | -1/+0 |
* | | | | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck' | Junio C Hamano | 2017-04-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | read-cache: force_verify_index_checksum | Jeff Hostetler | 2017-04-15 | 1 | -0/+1 |