summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \
| * | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()rs/checkout-some-states-are-constRené Scharfe2016-09-131-3/+3
* | | | | | | Merge branch 'jk/setup-sequence-update'Junio C Hamano2016-09-213-22/+35
|\ \ \ \ \ \ \
| * | | | | | | init: reset cached config when entering new repoJeff King2016-09-131-0/+6
| * | | | | | | init: expand comments explaining config trickeryJeff King2016-09-131-4/+7
| * | | | | | | diff: always try to set up the repositoryJeff King2016-09-131-2/+2
| * | | | | | | diff: skip implicit no-index check when given --no-indexJeff King2016-09-131-12/+13
| * | | | | | | hash-object: always try to set up the git repositoryJeff King2016-09-131-5/+8
| |/ / / / / /
* | | | | | | Merge branch 'ks/pack-objects-bitmap'Junio C Hamano2016-09-211-40/+88
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: use reachability bitmap index when generating non-stdout packks/pack-objects-bitmapKirill Smelkov2016-09-121-7/+24
| * | | | | | | pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is ...Kirill Smelkov2016-09-121-33/+64
* | | | | | | | Merge branch 'js/cat-file-filters'Junio C Hamano2016-09-211-8/+96
|\ \ \ \ \ \ \ \
| * | | | | | | | cat-file: support --textconv/--filters in batch modejs/cat-file-filtersJohannes Schindelin2016-09-111-5/+44
| * | | | | | | | cat-file --textconv/--filters: allow specifying the path separatelyJohannes Schindelin2016-09-111-5/+21
| * | | | | | | | cat-file: introduce the --filters optionJohannes Schindelin2016-09-111-1/+35
* | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2016-09-1915-285/+290
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/reset: convert to use struct object_idbrian m. carlson2016-09-071-26/+26