summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/t3600-cleanup'Junio C Hamano2016-12-191-73/+51
|\
| * t3600: slightly modernize stylesb/t3600-cleanupStefan Beller2016-12-121-73/+51
| * t3600: remove useless redirectStefan Beller2016-12-051-1/+1
* | Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-191-0/+17
|\ \
| * | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-291-0/+17
* | | Merge branch 'ld/p4-worktree'Junio C Hamano2016-12-192-0/+52
|\ \ \
| * | | git-p4: support git worktreesld/p4-worktreeLuke Diamand2016-12-132-0/+52
* | | | Merge branch 'jc/lock-report-on-error'Junio C Hamano2016-12-191-1/+1
|\ \ \ \
| * | | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-1/+1
| |/ / /
* | | | Merge branch 'nd/rebase-forget'Junio C Hamano2016-12-191-0/+24
|\ \ \ \
| * | | | rebase: add --quit to cleanup rebase, leave everything else untouchednd/rebase-forgetNguyễn Thái Ngọc Duy2016-12-111-0/+24
* | | | | Merge branch 'jk/trailers-placeholder-in-pretty'Junio C Hamano2016-12-192-0/+51
|\ \ \ \ \
| * | | | | ref-filter: add support to display trailers as part of contentsjk/trailers-placeholder-in-prettyJacob Keller2016-12-111-0/+26
| * | | | | pretty: add %(trailers) format for displaying trailers of a commit messageJacob Keller2016-12-111-0/+26
* | | | | | Merge branch 'ak/commit-only-allow-empty'Junio C Hamano2016-12-191-0/+9
|\ \ \ \ \ \
| * | | | | | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-051-0/+9
* | | | | | | Merge branch 'da/difftool-dir-diff-fix'Junio C Hamano2016-12-191-3/+41
|\ \ \ \ \ \ \
| * | | | | | | difftool: fix dir-diff index creation when in a subdirectoryda/difftool-dir-diff-fixDavid Aguilar2016-12-081-3/+41
| |/ / / / / /
* | | | | | | Merge branch 'jb/diff-no-index-no-abbrev'Junio C Hamano2016-12-197-0/+34
|\ \ \ \ \ \ \
| * | | | | | | diff: handle --no-abbrev in no-index casejb/diff-no-index-no-abbrevJack Bates2016-12-087-0/+34
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/stash-disable-renames-internally'Junio C Hamano2016-12-191-0/+9
|\ \ \ \ \ \ \
| * | | | | | | stash: prefer plumbing over git-diffjk/stash-disable-renames-internallyJeff King2016-12-061-0/+9
* | | | | | | | Merge branch 'jk/http-walker-limit-redirect-2.9'Junio C Hamano2016-12-194-0/+80
|\ \ \ \ \ \ \ \
| * | | | | | | | http: treat http-alternates like redirectsjk/http-walker-limit-redirect-2.9Jeff King2016-12-061-0/+38
| * | | | | | | | http: make redirects more obviousJeff King2016-12-062-0/+29
| * | | | | | | | http: always update the base URL for redirectsJeff King2016-12-063-0/+13
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/for-each-ref-ignore-case'Junio C Hamano2016-12-192-0/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | tag, branch, for-each-ref: add --ignore-case for sorting and filteringnd/for-each-ref-ignore-caseNguyễn Thái Ngọc Duy2016-12-052-0/+56
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/unpack-trees-grammofix'Junio C Hamano2016-12-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofixStefan Beller2016-12-051-1/+1
* | | | | | | | | 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 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-12-191-0/+12
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlfJunio C Hamano2016-12-011-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: handle NULL in add_cacheinfo() correctlyJohannes Schindelin2016-11-281-1/+1
| * | | | | | | | | | | cherry-pick: demonstrate a segmentation faultJohannes Schindelin2016-11-281-0/+12
* | | | | | | | | | | | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2016-12-193-8/+81
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | sequencer: use trailer's trailer layoutJonathan Tan2016-11-293-8/+81
* | | | | | | | | | | | Merge branch 'ls/p4-empty-file-on-lfs'Junio C Hamano2016-12-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: fix empty file processing for large file system backend GitLFSls/p4-empty-file-on-lfsLars Schneider2016-12-051-0/+2
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ld/p4-update-shelve'Junio C Hamano2016-12-161-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: support updating an existing shelved changelistld/p4-update-shelveLuke Diamand2016-12-051-0/+38
* | | | | | | | | | | | | Merge branch 'vk/p4-submit-shelve'Junio C Hamano2016-12-161-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | git-p4: allow submit to create shelved changelists.vk/p4-submit-shelveVinicius Kursancew2016-11-291-0/+31
| * | | | | | | | | | | | Merge branch 'pb/test-parse-options-expect' into maintJunio C Hamano2016-10-281-170/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tap-verbose-fix' into maintJunio C Hamano2016-10-282-4/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-10-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-281-0/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-281-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maintJunio C Hamano2016-10-281-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status