summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* receive-pack: quarantine objects until pre-receive acceptsJeff King2016-10-101-1/+40
* alternates: use fspathcmp to detect duplicatesJeff King2016-10-101-0/+2
* count-objects: report alternates via verbose modeJeff King2016-10-101-0/+10
* alternates: use a separate scratch spaceJeff King2016-10-102-16/+5
* Merge branch 'nd/init-core-worktree-in-multi-worktree-world'Junio C Hamano2016-10-032-48/+37
|\
| * init: kill git_link variablend/init-core-worktree-in-multi-worktree-worldNguyễn Thái Ngọc Duy2016-09-251-12/+4
| * init: do not set unnecessary core.worktreeNguyễn Thái Ngọc Duy2016-09-251-3/+6
| * init: kill set_git_dir_init()Nguyễn Thái Ngọc Duy2016-09-251-29/+21
| * init: call set_git_dir_init() from within init_db()Nguyễn Thái Ngọc Duy2016-09-252-15/+18
| * init: correct re-initialization from a linked worktreeNguyễn Thái Ngọc Duy2016-09-251-1/+1
* | Merge branch 'rs/copy-array'Junio C Hamano2016-10-031-1/+1
|\ \
| * | use COPY_ARRAYrs/copy-arrayRené Scharfe2016-09-251-1/+1
* | | Merge branch 'jc/worktree-config'Junio C Hamano2016-09-291-0/+2
|\ \ \
| * | | worktree: honor configuration variablesjc/worktree-configJunio C Hamano2016-09-271-0/+2
| * | | Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-192-2/+2
| |\ \ \
| * \ \ \ Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-191-0/+2
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/clone-recursive-progress'Junio C Hamano2016-09-262-5/+29
|\ \ \ \ \ \
| * | | | | | clone: pass --progress decision to recursive submodulesjk/clone-recursive-progressJeff King2016-09-222-5/+29
* | | | | | | Merge branch 'rs/checkout-init-macro'Junio C Hamano2016-09-262-3/+2
|\ \ \ \ \ \ \
| * | | | | | | introduce CHECKOUT_INITrs/checkout-init-macroRené Scharfe2016-09-222-3/+2
* | | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-264-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'Junio C Hamano2016-09-261-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 'jt/format-patch-rfc'Junio C Hamano2016-09-261-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH]jt/format-patch-rfcJosh Triplett2016-09-211-1/+9
| |/ / / / / / / /
* | | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-261-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-191-0/+12
* | | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-09-263-4/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe2016-09-153-4/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth'Junio C Hamano2016-09-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc: default aggressive depth to 50jk/reduce-gc-aggressive-depthJeff King2016-08-111-1/+1
* | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-09-218-103/+106
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | i18n: update-index: mark warnings for translationVasco Almeida2016-09-151-6/+6
| * | | | | | | | | | i18n: show-branch: mark plural strings for translationVasco Almeida2016-09-151-5/+9
| * | | | | | | | | | i18n: show-branch: mark error messages for translationVasco Almeida2016-09-151-8/+8
| * | | | | | | | | | i18n: receive-pack: mark messages for translationVasco Almeida2016-09-151-33/+25
| * | | | | | | | | | notes: spell first word of error messages in lowercaseVasco Almeida2016-09-151-32/+32
| * | | | | | | | | | i18n: notes: mark error messages for translationVasco Almeida2016-09-151-9/+11
| * | | | | | | | | | i18n: merge-recursive: mark verbose message for translationVasco Almeida2016-09-151-1/+1
| * | | | | | | | | | i18n: merge-recursive: mark error messages for translationVasco Almeida2016-09-151-7/+10
| * | | | | | | | | | i18n: config: mark error message for translationVasco Almeida2016-09-151-2/+2
| * | | | | | | | | | i18n: branch: mark option description for translationVasco Almeida2016-09-151-1/+1
| * | | | | | | | | | i18n: blame: mark error messages for translationVasco Almeida2016-09-151-8/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig'Junio C Hamano2016-09-211-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'Junio C Hamano2016-09-211-3/+3
|\ \ \ \ \ \ \ \ \ \