aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'jk/trailers-placeholder-in-pretty'Junio C Hamano2016-12-19
|\
| * ref-filter: add support to display trailers as part of contentsJacob Keller2016-12-11
| * pretty: add %(trailers) format for displaying trailers of a commit messageJacob Keller2016-12-11
* | Merge branch 'ak/commit-only-allow-empty'Junio C Hamano2016-12-19
|\ \
| * | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-05
* | | Merge branch 'da/difftool-dir-diff-fix'Junio C Hamano2016-12-19
|\ \ \
| * | | difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2016-12-08
| |/ /
* | | Merge branch 'jb/diff-no-index-no-abbrev'Junio C Hamano2016-12-19
|\ \ \
| * | | diff: handle --no-abbrev in no-index caseJack Bates2016-12-08
* | | | Merge branch 'jk/stash-disable-renames-internally'Junio C Hamano2016-12-19
|\ \ \ \
| * | | | stash: prefer plumbing over git-diffJeff King2016-12-06
* | | | | Merge branch 'jk/http-walker-limit-redirect-2.9'Junio C Hamano2016-12-19
|\ \ \ \ \
| * | | | | http: treat http-alternates like redirectsJeff King2016-12-06
| * | | | | http: make redirects more obviousJeff King2016-12-06
| * | | | | http: always update the base URL for redirectsJeff King2016-12-06
| | |_|/ / | |/| | |
* | | | | Merge branch 'nd/for-each-ref-ignore-case'Junio C Hamano2016-12-19
|\ \ \ \ \
| * | | | | tag, branch, for-each-ref: add --ignore-case for sorting and filteringNguyễn Thái Ngọc Duy2016-12-05
| | |_|/ / | |/| | |
* | | | | Merge branch 'sb/unpack-trees-grammofix'Junio C Hamano2016-12-19
|\ \ \ \ \
| * | | | | unpack-trees: fix grammar for untracked files in directoriesStefan Beller2016-12-05
* | | | | | Merge branch 'ls/t0021-fixup'Junio C Hamano2016-12-19
|\ \ \ \ \ \
| * | | | | | t0021: minor filter process test cleanupLars Schneider2016-12-05
* | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-12-19
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlfJunio C Hamano2016-12-01
| |\ \ \ \ \ \ \
| * | | | | | | | merge-recursive: handle NULL in add_cacheinfo() correctlyJohannes Schindelin2016-11-28
| * | | | | | | | cherry-pick: demonstrate a segmentation faultJohannes Schindelin2016-11-28
* | | | | | | | | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2016-12-19
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | sequencer: use trailer's trailer layoutJonathan Tan2016-11-29
* | | | | | | | | Merge branch 'ls/p4-empty-file-on-lfs'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: fix empty file processing for large file system backend GitLFSLars Schneider2016-12-05
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ld/p4-update-shelve'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: support updating an existing shelved changelistLuke Diamand2016-12-05
* | | | | | | | | | Merge branch 'vk/p4-submit-shelve'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | git-p4: allow submit to create shelved changelists.Vinicius Kursancew2016-11-29
| * | | | | | | | | Merge branch 'pb/test-parse-options-expect' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/tap-verbose-fix' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/ref-symlink-loop' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/lazy-prereq-mktemp'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t7610: clean up foo.XXXXXX tmpdirJeff King2016-11-29
* | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-list-fixup'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | worktree list: keep the list sortedNguyễn Thái Ngọc Duy2016-11-28
| * | | | | | | | | | | | | | | | | | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-28
* | | | | | | | | | | | | | | | | | | Merge branch 'bw/push-dry-run'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | push: fix --dry-run to not push submodulesBrandon Williams2016-11-23
| * | | | | | | | | | | | | | | | | | | push: --dry-run updates submodules when --recurse-submodules=on-demandBrandon Williams2016-11-23
* | | | | | | | | | | | | | | | | | | | Merge branch 'dt/empty-submodule-in-merge'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | submodules: allow empty working-tree dirs in merge/cherry-pickDavid Turner2016-11-17
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |