summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/blame-reverse'Junio C Hamano2016-10-101-2/+40
|\
| * blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."jc/blame-reverseJunio C Hamano2016-06-141-0/+38
| * blame: improve diagnosis for "--reverse NEW"Junio C Hamano2016-06-141-2/+2
* | Merge branch 'nd/shallow-deepen'Junio C Hamano2016-10-103-16/+85
|\ \
| * | fetch, upload-pack: --deepen=N extends shallow boundary by N commitsnd/shallow-deepenNguyễn Thái Ngọc Duy2016-06-132-1/+17
| * | clone: define shallow clone boundary with --shallow-excludeNguyễn Thái Ngọc Duy2016-06-131-1/+9
| * | fetch: define shallow boundary with --shallow-excludeNguyễn Thái Ngọc Duy2016-06-132-3/+17
| * | clone: define shallow clone boundary based on time with --shallow-sinceNguyễn Thái Ngọc Duy2016-06-131-3/+13
| * | fetch: define shallow boundary with --shallow-sinceNguyễn Thái Ngọc Duy2016-06-132-6/+27
| * | fetch-pack: use skip_prefix() instead of starts_with()Nguyễn Thái Ngọc Duy2016-06-131-6/+6
* | | Merge branch 'jk/pack-objects-optim-mru'Junio C Hamano2016-10-102-5/+92
|\ \ \
| * | | pack-objects: use mru list when iterating over packsjk/pack-objects-optim-mruJeff 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 QSORTrs/qsortRené Scharfe2016-10-031-4/+2
| * | | | use QSORT, part 2René Scharfe2016-09-292-3/+2
| * | | | remove unnecessary check before QSORTRené Scharfe2016-09-291-6/+4
| * | | | use QSORTRené Scharfe2016-09-298-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 macrojc/blame-abbrevJunio 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 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
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |