Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofix | Stefan Beller | 2016-12-05 | 2 | -2/+2 | |
* | | | | | | | | | | | Merge branch 'ls/travis-update-p4-and-lfs' | Junio C Hamano | 2016-12-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux buildls/travis-update-p4-and-lfs | Lars Schneider | 2016-12-05 | 1 | -2/+2 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'ls/t0021-fixup' | Junio C Hamano | 2016-12-19 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t0021: minor filter process test cleanupls/t0021-fixup | Lars Schneider | 2016-12-05 | 1 | -3/+2 | |
* | | | | | | | | | | | | Merge branch 'ah/grammos' | Junio C Hamano | 2016-12-19 | 4 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | clone,fetch: explain the shallow-clone option a little more clearlyah/grammos | Alex Henrie | 2016-12-05 | 2 | -2/+2 | |
| * | | | | | | | | | | | | receive-pack: improve English grammar of denyCurrentBranch message | Alex Henrie | 2016-12-05 | 1 | -2/+2 | |
| * | | | | | | | | | | | | bisect: improve English grammar of not-ancestors message | Alex Henrie | 2016-12-05 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-12-19 | 3 | -6/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | convert: git cherry-pick -Xrenormalize did not workjc/renormalize-merge-kill-safer-crlf | Torsten Bögershausen | 2016-12-01 | 1 | -6/+7 | |
| * | | | | | | | | | | | | Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf | Junio C Hamano | 2016-12-01 | 2 | -43/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | merge-recursive: handle NULL in add_cacheinfo() correctly | Johannes Schindelin | 2016-11-28 | 2 | -1/+3 | |
| * | | | | | | | | | | | | | cherry-pick: demonstrate a segmentation fault | Johannes Schindelin | 2016-11-28 | 1 | -0/+12 | |
* | | | | | | | | | | | | | | Merge branch 'jt/use-trailer-api-in-commands' | Junio C Hamano | 2016-12-19 | 9 | -198/+318 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | sequencer: use trailer's trailer layout | Jonathan Tan | 2016-11-29 | 4 | -69/+95 | |
| * | | | | | | | | | | | | | trailer: have function to describe trailer layout | Jonathan Tan | 2016-11-29 | 2 | -36/+107 | |
| * | | | | | | | | | | | | | trailer: avoid unnecessary splitting on lines | Jonathan Tan | 2016-11-29 | 1 | -94/+100 | |
| * | | | | | | | | | | | | | commit: make ignore_non_trailer take buf/len | Jonathan Tan | 2016-11-29 | 4 | -14/+14 | |
| * | | | | | | | | | | | | | trailer: be stricter in parsing separators | Jonathan Tan | 2016-11-29 | 1 | -6/+23 | |
* | | | | | | | | | | | | | | First batch for 2.12 | Junio C Hamano | 2016-12-16 | 1 | -1/+34 | |
* | | | | | | | | | | | | | | Merge branch 'ls/p4-retry-thrice' | Junio C Hamano | 2016-12-16 | 2 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git-p4: add config to retry p4 commands; retry 3 times by default | Lars Schneider | 2016-12-05 | 2 | -0/+9 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'ls/p4-empty-file-on-lfs' | Junio C Hamano | 2016-12-16 | 2 | -12/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git-p4: fix empty file processing for large file system backend GitLFSls/p4-empty-file-on-lfs | Lars Schneider | 2016-12-05 | 2 | -12/+19 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'ld/p4-update-shelve' | Junio C Hamano | 2016-12-16 | 3 | -4/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | git-p4: support updating an existing shelved changelistld/p4-update-shelve | Luke Diamand | 2016-12-05 | 3 | -4/+71 | |
* | | | | | | | | | | | | | | | Merge branch 'vk/p4-submit-shelve' | Junio C Hamano | 2016-12-16 | 3 | -14/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | git-p4: allow submit to create shelved changelists.vk/p4-submit-shelve | Vinicius Kursancew | 2016-11-29 | 3 | -14/+58 | |
* | | | | | | | | | | | | | | | Merge branch 'da/mergetool-trust-exit-code' | Junio C Hamano | 2016-12-16 | 20 | -38/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | mergetools/vimdiff: trust Vim's exit codeda/mergetool-trust-exit-code | David Aguilar | 2016-11-29 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 | 20 | -38/+71 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ak/lazy-prereq-mktemp' | Junio C Hamano | 2016-12-16 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktemp | Jeff King | 2016-11-29 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-list-fixup' | Junio C Hamano | 2016-12-16 | 6 | -30/+74 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | worktree list: keep the list sortednd/worktree-list-fixup | Nguyễn Thái Ngọc Duy | 2016-11-28 | 4 | -1/+36 | |
| * | | | | | | | | | | | | | | | | worktree.c: get_worktrees() takes a new flag argument | Nguyễn Thái Ngọc Duy | 2016-11-28 | 5 | -8/+8 | |
| * | | | | | | | | | | | | | | | | get_worktrees() must return main worktree as first item even on error | Nguyễn Thái Ngọc Duy | 2016-11-28 | 3 | -9/+28 | |
| * | | | | | | | | | | | | | | | | worktree: reorder an if statement | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | worktree.c: zero new 'struct worktree' on allocation | Nguyễn Thái Ngọc Duy | 2016-11-23 | 1 | -12/+2 | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/qsort-in-merge-recursive' | Junio C Hamano | 2016-12-16 | 1 | -9/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | merge-recursive.c: use string_list_sort instead of qsortnd/qsort-in-merge-recursive | Nguyễn Thái Ngọc Duy | 2016-11-28 | 1 | -9/+7 | |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'bw/push-dry-run' | Junio C Hamano | 2016-12-16 | 4 | -9/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | push: fix --dry-run to not push submodulesbw/push-dry-run | Brandon Williams | 2016-11-23 | 4 | -10/+18 | |
| * | | | | | | | | | | | | | | | | | push: --dry-run updates submodules when --recurse-submodules=on-demand | Brandon Williams | 2016-11-23 | 1 | -0/+24 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'hv/submodule-not-yet-pushed-fix' | Junio C Hamano | 2016-12-16 | 3 | -36/+121 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | submodule_needs_pushing(): explain the behaviour when we cannot answerhv/submodule-not-yet-pushed-fix | Heiko Voigt | 2016-11-16 | 1 | -0/+11 | |
| * | | | | | | | | | | | | | | | | | batch check whether submodule needs pushing into one call | Heiko Voigt | 2016-11-16 | 1 | -29/+33 | |
| * | | | | | | | | | | | | | | | | | serialize collection of refs that contain submodule changes | Heiko Voigt | 2016-11-16 | 3 | -25/+44 | |
| * | | | | | | | | | | | | | | | | | serialize collection of changed submodules | Heiko Voigt | 2016-11-16 | 1 | -4/+55 |