aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | rev-parse: fix parent shorthands with --symbolicJeff King2016-11-16
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | archive: read local configurationJunio C Hamano2016-11-22
| * | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: read local configurationJunio C Hamano2016-11-22
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: handle core.commentChar=autoJohannes Schindelin2016-11-21
| * | | | | | | | | | | | | | | | | | | | | | | | | stripspace: respect repository configJohannes Schindelin2016-11-21
| * | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: highlight problems with core.commentcharJohannes Schindelin2016-11-21
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/for-each-ref-head-segfault-fix'Junio C Hamano2016-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | for-each-ref: do not segv with %(HEAD) on an unborn branchJunio C Hamano2016-11-18
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/pwd-var-vs-pwd-cmd-fix'Junio C Hamano2016-11-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variablesJohannes Sixt2016-11-11
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/filter-process'Junio C Hamano2016-11-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t0021: remove debugging cruftJunio C Hamano2016-11-11
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/merge-attr-sleep'Junio C Hamano2016-11-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | t6026: clarify the point of "kill $(cat sleep.pid)"Johannes Sixt2016-11-11
| * | | | | | | | | | | | | | | | | | | | | | | | t6026: ensure that long-running script really isJohannes Schindelin2016-11-10
| * | | | | | | | | | | | | | | | | | | | | | | | Revert "t6026-merge-attr: don't fail if sleep exits early"Junio C Hamano2016-11-10
| * | | | | | | | | | | | | | | | | | | | | | | | Revert "t6026-merge-attr: ensure that the merge driver was called"Junio C Hamano2016-11-10