summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pack-objects-optim-mru'Junio C Hamano2016-10-102-5/+92
|\
| * pack-objects: use mru list when iterating over packsJeff King2016-08-111-3/+7
| * pack-objects: break delta cycles before delta-search phaseJeff King2016-08-111-0/+84
| * provide an initializer for "struct object_info"Jeff King2016-08-111-3/+2
* | Merge branch 'rs/qsort'Junio C Hamano2016-10-1010-31/+19
|\ \
| * | show-branch: use QSORTRené Scharfe2016-10-031-4/+2
| * | use QSORT, part 2René Scharfe2016-09-302-3/+2
| * | remove unnecessary check before QSORTRené Scharfe2016-09-301-6/+4
| * | use QSORTRené Scharfe2016-09-308-20/+13
* | | Merge branch 'rs/cocci'Junio C Hamano2016-10-061-1/+1
|\ \ \
| * | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-271-1/+1
* | | | Merge branch 'jc/blame-abbrev'Junio C Hamano2016-10-061-1/+1
|\ \ \ \
| * | | | blame: use DEFAULT_ABBREV macroJunio C Hamano2016-09-281-1/+1
* | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2016-10-061-13/+41
|\ \ \ \ \
| * | | | | revision: new rev^-n shorthand for rev^n..revVegard Nossum2016-09-271-13/+41
| |/ / / /
* | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-062-2/+4
|\ \ \ \ \
| * | | | | sha1_array: let callbacks interrupt iterationJeff King2016-09-262-2/+4
* | | | | | Merge branch 'nd/init-core-worktree-in-multi-worktree-world'Junio C Hamano2016-10-032-48/+37
|\ \ \ \ \ \
| * | | | | | init: kill git_link variableNguyễn Thái Ngọc Duy2016-09-261-12/+4
| * | | | | | init: do not set unnecessary core.worktreeNguyễn Thái Ngọc Duy2016-09-261-3/+6
| * | | | | | init: kill set_git_dir_init()Nguyễn Thái Ngọc Duy2016-09-261-29/+21
| * | | | | | init: call set_git_dir_init() from within init_db()Nguyễn Thái Ngọc Duy2016-09-262-15/+18
| * | | | | | init: correct re-initialization from a linked worktreeNguyễn Thái Ngọc Duy2016-09-261-1/+1
* | | | | | | Merge branch 'rs/copy-array'Junio C Hamano2016-10-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | use COPY_ARRAYRené Scharfe2016-09-261-1/+1
* | | | | | | | Merge branch 'jc/worktree-config'Junio C Hamano2016-09-301-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | worktree: honor configuration variablesJunio 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-272-5/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: pass --progress decision to recursive submodulesJeff King2016-09-222-5/+29
* | | | | | | | | | Merge branch 'rs/checkout-init-macro'Junio C Hamano2016-09-272-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | introduce CHECKOUT_INITRené Scharfe2016-09-222-3/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-274-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-151-1/+1
* | | | | | | | | | | Merge branch 'nd/checkout-disambiguation'Junio C Hamano2016-09-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout: fix ambiguity check in subdirNguyễ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-271-1/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH]Josh Triplett2016-09-211-1/+9
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-271-0/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: honor the diff heuristic options and configMichael Haggerty2016-09-191-0/+12
* | | | | | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-09-273-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-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc: default aggressive depth to 50Jeff King2016-08-111-1/+1
* | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-09-228-103/+106
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | i18n: update-index: mark warnings for translationVasco Almeida2016-09-151-6/+6