summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-292-3/+3
|\
| * create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-092-3/+3
* | Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-291-8/+6
|\ \
| * | commit: simplify building parents listrs/commit-pptr-simplifyRené Scharfe2016-10-301-8/+6
* | | Merge branch 'jc/am-read-author-file' into maintJunio C Hamano2016-11-291-58/+45
|\ \ \
| * | | am: refactor read_author_script()jc/am-read-author-fileJunio C Hamano2016-08-301-58/+45
* | | | Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-283-5/+6
|\ \ \ \
| * | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-271-1/+1
| * | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-153-4/+5
* | | | | Merge branch 'js/reset-usage' into maintJunio C Hamano2016-10-281-1/+1
|\ \ \ \ \
| * | | | | reset: fix usagejs/reset-usageJohannes Schindelin2016-10-111-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-281-4/+7
|\ \ \ \ \
| * | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-followingJeff King2016-10-141-4/+7
| | |_|_|/ | |/| | |
| * | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-081-3/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-081-2/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano2016-09-081-34/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-081-7/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-081-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-081-4/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-081-0/+3
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-281-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflogJeff King2016-10-121-0/+3
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano2016-10-281-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone: detect errors in normalize_path_copyjk/clone-copy-alternates-fixJeff King2016-10-051-2/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jc/worktree-config' into maintJunio C Hamano2016-10-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | worktree: honor configuration variablesjc/worktree-configJunio C Hamano2016-09-271-0/+2
* | | | | | | | | | | | | Merge branch 'jc/blame-abbrev' into maintJunio C Hamano2016-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: use DEFAULT_ABBREV macrojc/blame-abbrevJunio C Hamano2016-09-281-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/copy-array' into maintJunio C Hamano2016-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use COPY_ARRAYrs/copy-arrayRené Scharfe2016-09-251-1/+1
* | | | | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-031-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pack-objects: walk tag chains for --include-tagjk/pack-tag-of-tagJeff King2016-09-071-1/+30
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-294-36/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add: modify already added files when --chmod is givenThomas Gummerer2016-09-153-21/+30
| * | | | | | | | | | | | | | read-cache: introduce chmod_index_entryThomas Gummerer2016-09-151-14/+2
| * | | | | | | | | | | | | | update-index: add test for chmod flagsThomas Gummerer2016-09-141-1/+1
* | | | | | | | | | | | | | | Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-291-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguationNguyễn Thái Ngọc Duy2016-09-211-2/+2
| * | | | | | | | | | | | | | | checkout: add some spaces between code and commentNguyễn Thái Ngọc Duy2016-09-081-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gc: default aggressive depth to 50jk/reduce-gc-aggressive-depthJeff King2016-08-111-1/+1
* | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-291-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | format-patch: show base info before email signaturejt/format-patch-base-info-above-sigJosh Triplett2016-09-151-3/+3
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-291-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()rs/checkout-some-states-are-constRené Scharfe2016-09-131-3/+3
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-192-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | cat-file: put spaces around pipes in usage stringAlex Henrie2016-09-081-1/+1
| * | | | | | | | | | | | | | | am: put spaces around pipe in usage stringAlex Henrie2016-09-081-1/+1
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-191-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | symbolic-ref -d: do not allow removal of HEADjc/forbid-symbolic-ref-d-HEADJunio C Hamano2016-09-021-0/+2
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |