summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-051-0/+3
|\
| * am: handle "-h" argument earlierjk/unbreak-am-hJeff King2017-05-301-0/+3
* | Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-051-1/+1
|\ \
| * | interpret-trailers: honor the cut linebm/interpret-trailers-cut-line-is-eomBrian Malehorn2017-05-181-1/+1
| |/
* | Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-052-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 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2017-06-051-1/+3
|\ \ \
| * | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-lineJonathan Nieder2017-05-021-1/+3
* | | | Merge branch 'ab/c-translators-comment-style' into maintJunio C Hamano2017-06-053-10/+18
|\ \ \ \
| * | | | C style: use standard style for "TRANSLATORS" commentsab/c-translators-comment-styleÆvar Arnfjörð Bjarmason2017-05-313-10/+18
| | |_|/ | |/| |
* | | | Merge branch 'jt/push-options-doc' into maintJunio C Hamano2017-06-041-2/+49
|\ \ \ \
| * | | | receive-pack: verify push options in certjt/push-options-docJonathan Tan2017-05-101-2/+49
| | |_|/ | |/| |
* | | | Merge branch 'js/plug-leaks' into maintJunio C Hamano2017-06-0411-35/+69
|\ \ \ \
| * | | | checkout: fix memory leakjs/plug-leaksJunio C Hamano2017-05-091-0/+1
| * | | | show_worktree(): plug memory leakJohannes Schindelin2017-05-081-3/+5
| * | | | name-rev: avoid leaking memory in the `deref` caseJohannes Schindelin2017-05-081-2/+5
| * | | | receive-pack: plug memory leak in update()Johannes Schindelin2017-05-081-1/+3
| * | | | fast-export: avoid leaking memory in handle_tag()Johannes Schindelin2017-05-081-0/+2
| * | | | mktree: plug memory leaks reported by CoverityJohannes Schindelin2017-05-081-2/+3
| * | | | pack-redundant: plug memory leakJohannes Schindelin2017-05-081-0/+1
| * | | | checkout: fix memory leakJohannes Schindelin2017-05-081-8/+9
| * | | | cat-file: fix memory leakJohannes Schindelin2017-05-081-0/+1
| * | | | mailinfo & mailsplit: check for EOF while parsingJohannes Schindelin2017-05-081-0/+10
| * | | | difftool: address a couple of resource/memory leaksJohannes Schindelin2017-05-081-10/+23
| * | | | get_mail_commit_oid(): avoid resource leakJohannes Schindelin2017-05-081-9/+6
* | | | | Merge branch 'jk/disable-pack-reuse-when-broken' into maintJunio C Hamano2017-06-041-1/+5
|\ \ \ \ \
| * | | | | pack-objects: disable pack reuse for object-selection optionsJeff King2017-05-091-1/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/am-leakfix' into maintJunio C Hamano2017-06-041-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 'jc/read-tree-empty-with-m' into maintJunio C Hamano2017-06-041-1/+1
|\ \ \ \ \
| * | | | | read-tree: "read-tree -m --empty" does not make sensejc/read-tree-empty-with-mJunio C Hamano2017-05-101-1/+1
* | | | | | Merge branch 'ja/do-not-ask-needless-questions' into maintJunio C Hamano2017-06-043-7/+8
|\ \ \ \ \ \
| * | | | | | read-tree -m: make error message for merging 0 trees less smart aleckJean-Noel Avila2017-05-121-2/+3
| * | | | | | usability: don't ask questions if no reply is requiredJean-Noel Avila2017-05-122-5/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ah/log-decorate-default-to-auto' into maintJunio C Hamano2017-06-041-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | builtin/log: honor log.decorateah/log-decorate-default-to-autobrian m. carlson2017-05-151-2/+2
* | | | | | 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
View Lorry Controller Status