aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-29
|\
| * create_branch: drop unused "head" parameterJeff King2016-11-09
* | Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-29
|\ \
| * | commit: simplify building parents listRené Scharfe2016-10-30
* | | Merge branch 'jc/am-read-author-file' into maintJunio C Hamano2016-11-29
|\ \ \
| * | | am: refactor read_author_script()Junio C Hamano2016-08-30
* | | | Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-28
|\ \ \ \
| * | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-27
| * | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-15
* | | | | Merge branch 'js/reset-usage' into maintJunio C Hamano2016-10-28
|\ \ \ \ \
| * | | | | reset: fix usageJohannes Schindelin2016-10-11
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-28
|\ \ \ \ \
| * | | | | fetch: use "quick" has_sha1_file for tag followingJeff King2016-10-14
| | |_|_|/ | |/| | |
| * | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-08
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge-base: handle --fork-point without reflogJeff King2016-10-12
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano2016-10-28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone: detect errors in normalize_path_copyJeff King2016-10-05
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jc/worktree-config' into maintJunio C Hamano2016-10-11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | worktree: honor configuration variablesJunio C Hamano2016-09-27
* | | | | | | | | | | | | Merge branch 'jc/blame-abbrev' into maintJunio C Hamano2016-10-11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: use DEFAULT_ABBREV macroJunio C Hamano2016-09-28
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/copy-array' into maintJunio C Hamano2016-10-11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use COPY_ARRAYRené Scharfe2016-09-25
* | | | | | | | | | | | | | Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pack-objects: walk tag chains for --include-tagJeff King2016-09-07
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add: modify already added files when --chmod is givenThomas Gummerer2016-09-15
| * | | | | | | | | | | | | | read-cache: introduce chmod_index_entryThomas Gummerer2016-09-15
| * | | | | | | | | | | | | | update-index: add test for chmod flagsThomas Gummerer2016-09-14
* | | | | | | | | | | | | | | Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | checkout: fix ambiguity check in subdirNguyễn Thái Ngọc Duy2016-09-21
| * | | | | | | | | | | | | | | checkout: add some spaces between code and commentNguyễn Thái Ngọc Duy2016-09-08
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gc: default aggressive depth to 50Jeff King2016-08-11
* | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | format-patch: show base info before email signatureJosh Triplett2016-09-15
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()René Scharfe2016-09-13
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | cat-file: put spaces around pipes in usage stringAlex Henrie2016-09-08
| * | | | | | | | | | | | | | | am: put spaces around pipe in usage stringAlex Henrie2016-09-08
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | symbolic-ref -d: do not allow removal of HEADJunio C Hamano2016-09-02
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |