summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofixStefan Beller2016-12-052-2/+2
* | | | | | | | | | | Merge branch 'ls/travis-update-p4-and-lfs'Junio C Hamano2016-12-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux buildls/travis-update-p4-and-lfsLars Schneider2016-12-051-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ls/t0021-fixup'Junio C Hamano2016-12-191-3/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t0021: minor filter process test cleanupls/t0021-fixupLars Schneider2016-12-051-3/+2
* | | | | | | | | | | | Merge branch 'ah/grammos'Junio C Hamano2016-12-194-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | clone,fetch: explain the shallow-clone option a little more clearlyah/grammosAlex Henrie2016-12-052-2/+2
| * | | | | | | | | | | | receive-pack: improve English grammar of denyCurrentBranch messageAlex Henrie2016-12-051-2/+2
| * | | | | | | | | | | | bisect: improve English grammar of not-ancestors messageAlex Henrie2016-12-051-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-12-193-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | convert: git cherry-pick -Xrenormalize did not workjc/renormalize-merge-kill-safer-crlfTorsten Bögershausen2016-12-011-6/+7
| * | | | | | | | | | | | Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlfJunio C Hamano2016-12-012-43/+60
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge-recursive: handle NULL in add_cacheinfo() correctlyJohannes Schindelin2016-11-282-1/+3
| * | | | | | | | | | | | | cherry-pick: demonstrate a segmentation faultJohannes Schindelin2016-11-281-0/+12
* | | | | | | | | | | | | | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2016-12-199-198/+318
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | sequencer: use trailer's trailer layoutJonathan Tan2016-11-294-69/+95
| * | | | | | | | | | | | | trailer: have function to describe trailer layoutJonathan Tan2016-11-292-36/+107
| * | | | | | | | | | | | | trailer: avoid unnecessary splitting on linesJonathan Tan2016-11-291-94/+100
| * | | | | | | | | | | | | commit: make ignore_non_trailer take buf/lenJonathan Tan2016-11-294-14/+14
| * | | | | | | | | | | | | trailer: be stricter in parsing separatorsJonathan Tan2016-11-291-6/+23
* | | | | | | | | | | | | | First batch for 2.12Junio C Hamano2016-12-161-1/+34
* | | | | | | | | | | | | | Merge branch 'ls/p4-retry-thrice'Junio C Hamano2016-12-162-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-p4: add config to retry p4 commands; retry 3 times by defaultLars Schneider2016-12-052-0/+9
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ls/p4-empty-file-on-lfs'Junio C Hamano2016-12-162-12/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-p4: fix empty file processing for large file system backend GitLFSls/p4-empty-file-on-lfsLars Schneider2016-12-052-12/+19
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'ld/p4-update-shelve'Junio C Hamano2016-12-163-4/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-p4: support updating an existing shelved changelistld/p4-update-shelveLuke Diamand2016-12-053-4/+71
* | | | | | | | | | | | | | | Merge branch 'vk/p4-submit-shelve'Junio C Hamano2016-12-163-14/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | git-p4: allow submit to create shelved changelists.vk/p4-submit-shelveVinicius Kursancew2016-11-293-14/+58
* | | | | | | | | | | | | | | Merge branch 'da/mergetool-trust-exit-code'Junio C Hamano2016-12-1620-38/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mergetools/vimdiff: trust Vim's exit codeda/mergetool-trust-exit-codeDavid Aguilar2016-11-291-0/+4
| * | | | | | | | | | | | | | | mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-2920-38/+71
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ak/lazy-prereq-mktemp'Junio C Hamano2016-12-161-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktempJeff King2016-11-291-1/+2
* | | | | | | | | | | | | | | | Merge branch 'nd/worktree-list-fixup'Junio C Hamano2016-12-166-30/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | worktree list: keep the list sortednd/worktree-list-fixupNguyễn Thái Ngọc Duy2016-11-284-1/+36
| * | | | | | | | | | | | | | | | worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-285-8/+8
| * | | | | | | | | | | | | | | | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-283-9/+28
| * | | | | | | | | | | | | | | | worktree: reorder an if statementNguyễn Thái Ngọc Duy2016-11-281-3/+3
| * | | | | | | | | | | | | | | | worktree.c: zero new 'struct worktree' on allocationNguyễn Thái Ngọc Duy2016-11-231-12/+2
* | | | | | | | | | | | | | | | | Merge branch 'nd/qsort-in-merge-recursive'Junio C Hamano2016-12-161-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge-recursive.c: use string_list_sort instead of qsortnd/qsort-in-merge-recursiveNguyễn Thái Ngọc Duy2016-11-281-9/+7
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'bw/push-dry-run'Junio C Hamano2016-12-164-9/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | push: fix --dry-run to not push submodulesbw/push-dry-runBrandon Williams2016-11-234-10/+18
| * | | | | | | | | | | | | | | | | push: --dry-run updates submodules when --recurse-submodules=on-demandBrandon Williams2016-11-231-0/+24
* | | | | | | | | | | | | | | | | | Merge branch 'hv/submodule-not-yet-pushed-fix'Junio C Hamano2016-12-163-36/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | submodule_needs_pushing(): explain the behaviour when we cannot answerhv/submodule-not-yet-pushed-fixHeiko Voigt2016-11-161-0/+11
| * | | | | | | | | | | | | | | | | batch check whether submodule needs pushing into one callHeiko Voigt2016-11-161-29/+33
| * | | | | | | | | | | | | | | | | serialize collection of refs that contain submodule changesHeiko Voigt2016-11-163-25/+44
| * | | | | | | | | | | | | | | | | serialize collection of changed submodulesHeiko Voigt2016-11-161-4/+55