summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/include-comments-before-the-function-header'Junio C Hamano2017-11-283-10/+38
|\
| * grep: show non-empty lines before functions with -Wrs/include-comments-before-the-function-headerRené Scharfe2017-11-211-1/+1
| * t7810: improve check of -W with user-defined function linesRené Scharfe2017-11-211-10/+31
| * xdiff: show non-empty lines before functions with -WRené Scharfe2017-11-211-1/+1
| * t4051: add test for comments preceding function linesRené Scharfe2017-11-212-0/+7
* | Merge branch 'ma/branch-list-paginate'Junio C Hamano2017-11-281-0/+38
|\ \
| * | branch: change default of `pager.branch` to "on"ma/branch-list-paginateMartin Ågren2017-11-201-5/+5
| * | branch: respect `pager.branch` in list-mode onlyMartin Ågren2017-11-201-3/+3
| * | t7006: add tests for how git branch paginatesMartin Ågren2017-11-201-0/+38
* | | Merge branch 'jc/branch-name-sanity'Junio C Hamano2017-11-281-0/+43
|\ \ \
| * | | branch: correctly reject refs/heads/{-dash,HEAD}Junio C Hamano2017-11-151-0/+43
* | | | Merge branch 'ew/rebase-mboxrd'Junio C Hamano2017-11-271-0/+22
|\ \ \ \
| * | | | rebase: use mboxrd format to avoid split errorsew/rebase-mboxrdEric Wong2017-11-181-0/+22
| * | | | Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano2017-11-151-0/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/wincred-empty-cred' into maintJunio C Hamano2017-11-151-0/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ad/5580-unc-tests-on-cygwin' into maintJunio C Hamano2017-11-151-4/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tb/complete-checkout' into maintJunio C Hamano2017-11-151-0/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano2017-11-151-0/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/t5601-copy-workaround' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2017-11-151-0/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/submodule-in-excluded' into maintJunio C Hamano2017-11-151-0/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maintJunio C Hamano2017-11-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-color-moved-fix' into maintJunio C Hamano2017-11-151-36/+177
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kd/auto-col-with-pager-fix' into maintJunio C Hamano2017-11-151-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-271-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add: introduce "--renormalize"tb/add-renormalizeTorsten Bögershausen2017-11-171-0/+30
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line'Junio C Hamano2017-11-271-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | apply: update line lengths for --inaccurate-eofrs/apply-inaccurate-eof-with-incomplete-lineRené Scharfe2017-11-171-0/+14
* | | | | | | | | | | | | | | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Junio C Hamano2017-11-271-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | merge-recursive: handle addition of submodule on our side of historysb/test-cherry-pick-submodule-getting-in-a-wayElijah Newren2017-11-151-1/+1
| * | | | | | | | | | | | | | | | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller2017-11-121-0/+36
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tz/notes-error-to-stderr'Junio C Hamano2017-11-272-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderrTodd Zullinger2017-11-152-5/+5
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tz/redirect-fix'Junio C Hamano2017-11-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t/lib-gpg: fix gpgconf stderr redirect to /dev/nullTodd Zullinger2017-11-141-1/+1
* | | | | | | | | | | | | | | | | | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-271-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-081-0/+28
* | | | | | | | | | | | | | | | | | | Merge branch 'av/fsmonitor'Junio C Hamano2017-11-212-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | fsmonitor: simplify determining the git worktree under Windowsav/fsmonitorBen Peart2017-11-131-10/+3
| * | | | | | | | | | | | | | | | | | | fsmonitor: store fsmonitor bitmap before splitting indexAlex Vandiver2017-11-101-0/+13
| * | | | | | | | | | | | | | | | | | | fsmonitor: read from getcwd(), not the PWD environment variableAlex Vandiver2017-11-101-1/+2
* | | | | | | | | | | | | | | | | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-219-0/+861
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fsmonitor: preserve utf8 filenames in fsmonitor-watchman logBen Peart2017-10-051-0/+1
| * | | | | | | | | | | | | | | | | | fsmonitor: read entirety of watchman outputAlex Vandiver2017-10-041-4/+2
| * | | | | | | | | | | | | | | | | | fsmonitor: MINGW support for watchman integrationBen Peart2017-10-041-1/+1
| * | | | | | | | | | | | | | | | | | fsmonitor: add a performance testBen Peart2017-10-013-0/+349
| * | | | | | | | | | | | | | | | | | fsmonitor: add test cases for fsmonitor extensionBen Peart2017-10-014-0/+490
| * | | | | | | | | | | | | | | | | | split-index: disable the fsmonitor extension when running the split index testBen Peart2017-10-011-0/+1
| * | | | | | | | | | | | | | | | | | fsmonitor: add a test tool to dump the index extensionBen Peart2017-10-012-0/+22
* | | | | | | | | | | | | | | | | | | Merge branch 'cb/t4201-robustify'Junio C Hamano2017-11-152-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \