aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* alternates: use a separate scratch spaceJeff King2016-10-10
* Merge branch 'nd/init-core-worktree-in-multi-worktree-world'Junio C Hamano2016-10-03
|\
| * init: kill git_link variableNguyễn Thái Ngọc Duy2016-09-25
| * init: do not set unnecessary core.worktreeNguyễn Thái Ngọc Duy2016-09-25
| * init: kill set_git_dir_init()Nguyễn Thái Ngọc Duy2016-09-25
| * init: call set_git_dir_init() from within init_db()Nguyễn Thái Ngọc Duy2016-09-25
| * init: correct re-initialization from a linked worktreeNguyễn Thái Ngọc Duy2016-09-25
* | Merge branch 'rs/copy-array'Junio C Hamano2016-10-03
|\ \
| * | use COPY_ARRAYRené Scharfe2016-09-25
* | | Merge branch 'jc/worktree-config'Junio C Hamano2016-09-29
|\ \ \
| * | | worktree: honor configuration variablesJunio C Hamano2016-09-27
| * | | Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-19
| |\ \ \
| * \ \ \ Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-19
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/clone-recursive-progress'Junio C Hamano2016-09-26
|\ \ \ \ \ \
| * | | | | | clone: pass --progress decision to recursive submodulesJeff King2016-09-22
* | | | | | | Merge branch 'rs/checkout-init-macro'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \
| * | | | | | | introduce CHECKOUT_INITRené Scharfe2016-09-22
* | | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \
| * | | | | | | | 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'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 'jt/format-patch-rfc'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH]Josh Triplett2016-09-21
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-19
* | | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-15
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth'Junio C Hamano2016-09-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc: default aggressive depth to 50Jeff King2016-08-11
* | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-09-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | i18n: update-index: mark warnings for translationVasco Almeida2016-09-15
| * | | | | | | | | | i18n: show-branch: mark plural strings for translationVasco Almeida2016-09-15
| * | | | | | | | | | i18n: show-branch: mark error messages for translationVasco Almeida2016-09-15
| * | | | | | | | | | i18n: receive-pack: mark messages for translationVasco Almeida2016-09-15
| * | | | | | | | | | notes: spell first word of error messages in lowercaseVasco Almeida2016-09-15
| * | | | | | | | | | i18n: notes: mark error messages for translationVasco Almeida2016-09-15
| * | | | | | | | | | i18n: merge-recursive: mark verbose message for translationVasco Almeida2016-09-15
| * | | | | | | | | | i18n: merge-recursive: mark error messages for translationVasco Almeida2016-09-15
| * | | | | | | | | | i18n: config: mark error message for translationVasco Almeida2016-09-15
| * | | | | | | | | | i18n: branch: mark option description for translationVasco Almeida2016-09-15
| * | | | | | | | | | i18n: blame: mark error messages for translationVasco Almeida2016-09-15
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig'Junio C Hamano2016-09-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: show base info before email signatureJosh Triplett2016-09-15
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rs/checkout-some-states-are-const'Junio C Hamano2016-09-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()René Scharfe2016-09-13
* | | | | | | | | | | Merge branch 'jk/setup-sequence-update'Junio C Hamano2016-09-21
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | init: reset cached config when entering new repoJeff King2016-09-13