summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/more-textconv'Junio C Hamano2013-10-233-15/+60
|\
| * grep: honor --textconv for the case rev:pathmg/more-textconvMichael J Gruber2013-05-101-5/+1
| * grep: allow to use textconv filtersJeff King2013-05-101-1/+5
| * t7008: demonstrate behavior of grep with textconvMichael J Gruber2013-05-101-0/+31
| * cat-file: do not die on --textconv without textconv filtersMichael J Gruber2013-05-101-15/+5
| * show: honor --textconv for blobsMichael J Gruber2013-05-101-3/+3
| * t4030: demonstrate behavior of show with textconvMichael J Gruber2013-05-101-0/+24
* | Merge branch 'jk/clone-progress-to-stderr'Junio C Hamano2013-10-183-5/+11
|\ \
| * | clone: always set transport optionsjk/clone-progress-to-stderrJeff King2013-09-181-0/+4
| * | clone: treat "checking connectivity" like other progressJeff King2013-09-181-1/+2
| * | clone: send diagnostic messages to stderrJeff King2013-09-182-5/+6
* | | Merge branch 'jk/format-patch-from'Junio C Hamano2013-10-171-0/+10
|\ \ \
| * | | format-patch: print in-body "From" only when neededjk/format-patch-fromJeff King2013-09-201-0/+10
* | | | Merge branch 'jk/trailing-slash-in-pathspec'Junio C Hamano2013-10-171-2/+4
|\ \ \ \
| * | | | reset: handle submodule with trailing slashjk/trailing-slash-in-pathspecJohn Keeping2013-09-131-2/+4
* | | | | Sync with maintJunio C Hamano2013-10-171-21/+15
|\ \ \ \ \
| * \ \ \ \ Merge branch 'nd/git-dir-pointing-at-gitfile' into maintJunio C Hamano2013-10-171-0/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-171-0/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'es/rebase-i-no-abbrev' into maintJunio C Hamano2013-10-171-2/+87
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rt/rebase-p-no-merge-summary' into maintJunio C Hamano2013-10-171-0/+23
| |\ \ \ \ \ \ \ \
| * | | | | | | | | t4254: modernize testsSZEDER Gábor2013-10-171-21/+15
* | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2013-10-161-0/+67
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-svn: Warn about changing default for --prefix in Git v2.0Johan Herland2013-10-121-0/+67
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-10-151-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2013-10-141-1/+7
| * | | | | | | | | | Merge branch 'bc/completion-for-bash-3.0' into maintJunio C Hamano2013-09-181-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/no-shell-escape-in-die-message' into maintJunio C Hamano2013-09-181-0/+13
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/some-submodule-config-are-not-boolean' into maintJunio C Hamano2013-09-181-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/log-full-diff-keep-true-parents' into maintJunio C Hamano2013-09-182-0/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' into maintJunio C Hamano2013-09-181-0/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/clip-read-write-to-8mb' into maintJunio C Hamano2013-09-181-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/mailmap-incomplete-line' into maintJunio C Hamano2013-09-181-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/highlight-test-hang'Jonathan Nieder2013-10-141-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | gitweb test: fix highlight test hang on Linux Mintrj/highlight-test-hangRamsay Jones2013-10-141-2/+4
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/checkout-test-complex-path'Jonathan Nieder2013-10-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | checkout test: enable test with complex relative pathsb/checkout-test-complex-pathStefan Beller2013-10-091-7/+7
* | | | | | | | | | | | | | | | | | | | Merge branch 'rt/cherry-pick-status'Jonathan Nieder2013-10-141-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | status: show commit sha1 in "You are currently cherry-picking" messagert/cherry-pick-statusRalf Thielow2013-10-111-4/+6
| * | | | | | | | | | | | | | | | | | | | status test: add missing && to <<EOF blocksJonathan Nieder2013-10-111-5/+5
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/clone-local-with-colon'Jonathan Nieder2013-10-141-1/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | clone: tighten "local paths with colons" check a bitnd/clone-local-with-colonNguyễn Thái Ngọc Duy2013-09-271-1/+45
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jx/clean-interactive'Jonathan Nieder2013-10-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | path-utils test: rename mingw_path function to print_pathjx/clean-interactiveSebastian Schuberth2013-10-141-2/+2
* | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/submodule-status-ignored'Jonathan Nieder2013-09-242-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | submodule: don't print status output with ignore=allBrian M. Carlson2013-09-042-2/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cc/replace-with-the-same-type'Jonathan Nieder2013-09-241-3/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | t6050-replace: use some long option namesChristian Couder2013-09-061-4/+4
| * | | | | | | | | | | | | | | | | | | | | t6050-replace: add test to clean up all the replace refsChristian Couder2013-09-061-0/+6
| * | | | | | | | | | | | | | | | | | | | | t6050-replace: test that objects are of the same typeChristian Couder2013-09-061-0/+13
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/shortlog-tolerate-broken-commit'Jonathan Nieder2013-09-241-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status