Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/create-branch-remove-unused-param' into maint | Junio C Hamano | 2016-11-29 | 2 | -3/+3 |
|\ | |||||
| * | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-param | Jeff King | 2016-11-09 | 2 | -3/+3 |
* | | Merge branch 'rs/commit-pptr-simplify' into maint | Junio C Hamano | 2016-11-29 | 1 | -8/+6 |
|\ \ | |||||
| * | | commit: simplify building parents listrs/commit-pptr-simplify | René Scharfe | 2016-10-30 | 1 | -8/+6 |
* | | | Merge branch 'jc/am-read-author-file' into maint | Junio C Hamano | 2016-11-29 | 1 | -58/+45 |
|\ \ \ | |||||
| * | | | am: refactor read_author_script()jc/am-read-author-file | Junio C Hamano | 2016-08-30 | 1 | -58/+45 |
* | | | | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-10-28 | 3 | -5/+6 |
|\ \ \ \ | |||||
| * | | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 | René Scharfe | 2016-09-27 | 1 | -1/+1 |
| * | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2 | René Scharfe | 2016-09-15 | 3 | -4/+5 |
* | | | | | Merge branch 'js/reset-usage' into maint | Junio C Hamano | 2016-10-28 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | reset: fix usagejs/reset-usage | Johannes Schindelin | 2016-10-11 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/fetch-quick-tag-following' into maint | Junio C Hamano | 2016-10-28 | 1 | -4/+7 |
|\ \ \ \ \ | |||||
| * | | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-following | Jeff King | 2016-10-14 | 1 | -4/+7 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-09-08 | 1 | -3/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint | Junio C Hamano | 2016-09-08 | 1 | -2/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rs/merge-add-strategies-simplification' into maint | Junio C Hamano | 2016-09-08 | 1 | -34/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'js/no-html-bypass-on-windows' into maint | Junio C Hamano | 2016-09-08 | 1 | -7/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'sb/checkout-explit-detach-no-advice' into maint | Junio C Hamano | 2016-09-08 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'js/mv-dir-to-new-directory' into maint | Junio C Hamano | 2016-09-08 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reflog-date' into maint | Junio C Hamano | 2016-09-08 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/merge-base-fork-point-without-reflog' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflog | Jeff King | 2016-10-12 | 1 | -0/+3 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/clone-copy-alternates-fix' into maint | Junio C Hamano | 2016-10-28 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | clone: detect errors in normalize_path_copyjk/clone-copy-alternates-fix | Jeff King | 2016-10-05 | 1 | -2/+5 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'jc/worktree-config' into maint | Junio C Hamano | 2016-10-11 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | worktree: honor configuration variablesjc/worktree-config | Junio C Hamano | 2016-09-27 | 1 | -0/+2 |
* | | | | | | | | | | | | | Merge branch 'jc/blame-abbrev' into maint | Junio C Hamano | 2016-10-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | blame: use DEFAULT_ABBREV macrojc/blame-abbrev | Junio C Hamano | 2016-09-28 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'rs/copy-array' into maint | Junio C Hamano | 2016-10-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | use COPY_ARRAYrs/copy-array | René Scharfe | 2016-09-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' into maint | Junio C Hamano | 2016-10-03 | 1 | -1/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | pack-objects: walk tag chains for --include-tagjk/pack-tag-of-tag | Jeff King | 2016-09-07 | 1 | -1/+30 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-09-29 | 4 | -36/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 | 3 | -21/+30 |
| * | | | | | | | | | | | | | | read-cache: introduce chmod_index_entry | Thomas Gummerer | 2016-09-15 | 1 | -14/+2 |
| * | | | | | | | | | | | | | | update-index: add test for chmod flags | Thomas Gummerer | 2016-09-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge branch 'nd/checkout-disambiguation' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguation | Nguyễn Thái Ngọc Duy | 2016-09-21 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | checkout: add some spaces between code and comment | Nguyễn Thái Ngọc Duy | 2016-09-08 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | gc: default aggressive depth to 50jk/reduce-gc-aggressive-depth | Jeff King | 2016-08-11 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | format-patch: show base info before email signaturejt/format-patch-base-info-above-sig | Josh Triplett | 2016-09-15 | 1 | -3/+3 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'rs/checkout-some-states-are-const' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()rs/checkout-some-states-are-const | René Scharfe | 2016-09-13 | 1 | -3/+3 |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'ah/misc-message-fixes' into maint | Junio C Hamano | 2016-09-19 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | cat-file: put spaces around pipes in usage string | Alex Henrie | 2016-09-08 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | am: put spaces around pipe in usage string | Alex Henrie | 2016-09-08 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint | Junio C Hamano | 2016-09-19 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | symbolic-ref -d: do not allow removal of HEADjc/forbid-symbolic-ref-d-HEAD | Junio C Hamano | 2016-09-02 | 1 | -0/+2 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |