summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/grep-open'Junio C Hamano2010-06-304-12/+172
|\
| * t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" scriptBrandon Casey2010-06-211-5/+0
| * t/t7811-grep-open.sh: ensure fake "less" is made executableBrandon Casey2010-06-211-1/+2
| * t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expressionBrandon Casey2010-06-211-1/+1
| * grep -O: allow optional argument specifying the pager (or editor)Johannes Schindelin2010-06-131-3/+6
| * grep: Add the option '--open-files-in-pager'Johannes Schindelin2010-06-134-12/+173
* | Merge branch 'tr/rev-list-count'Junio C Hamano2010-06-301-0/+29
|\ \
| * | rev-list: introduce --count optionThomas Rast2010-06-121-0/+29
* | | Merge branch 'mg/rev-parse-tests'Junio C Hamano2010-06-301-1/+16
|\ \ \
| * | | t6018: make sure all tested symbolic names are different revsMichael J Gruber2010-06-271-1/+3
| * | | t6018: add tests for rev-list's --branches and --tagsMichael J Gruber2010-06-271-0/+13
* | | | Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano2010-06-302-2/+97
|\ \ \ \
| * | | | t4027,4041: Use test -s to test for an empty fileBrian Gernhardt2010-06-252-13/+13
| * | | | Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann2010-06-112-3/+98
| * | | | git diff: rename test that had a conflicting nameJens Lehmann2010-06-111-0/+0
* | | | | Sync with 1.7.1.1Junio C Hamano2010-06-291-3/+3
|\ \ \ \ \
| * | | | | t/t9001: use egrep when regular expressions are involvedBrandon Casey2010-06-291-3/+3
* | | | | | Merge branch 'maint'Junio C Hamano2010-06-281-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'tr/send-email-8bit' into maintJunio C Hamano2010-06-281-0/+77
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/maint-am-rebase-invalid-author' into maintJunio C Hamano2010-06-281-2/+7
| |\ \ \ \ \ \
| * | | | | | | notes: check number of parameters to "git notes copy"Jeff King2010-06-281-0/+6
* | | | | | | | Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-271-0/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | t/t8007: test textconv support for cat-fileClément Poulain2010-06-181-0/+70
* | | | | | | | | Merge branch 'tr/send-email-8bit'Junio C Hamano2010-06-271-0/+77
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | send-email: ask about and declare 8bit mailsThomas Rast2010-06-181-0/+77
* | | | | | | | | Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-271-2/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-161-2/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-271-0/+80
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | t/t8006: test textconv support for blameAxel Bonnet2010-06-181-0/+80
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-222-0/+55
|\ \ \ \ \ \
| * | | | | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-162-0/+55
* | | | | | | Merge branch 'mg/pretty-magic-space'Junio C Hamano2010-06-221-0/+10
|\ \ \ \ \ \ \
| * | | | | | | pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber2010-06-161-0/+10
| |/ / / / / /
* | | | | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-221-0/+95
|\ \ \ \ \ \ \
| * | | | | | | revert: add tests to check cherry-picking many commitsChristian Couder2010-06-021-0/+95
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano2010-06-221-0/+73
|\ \ \ \ \ \ \
| * | | | | | | revision: Turn off history simplification in --ancestry-path modeJohan Herland2010-06-061-0/+17
| * | | | | | | revision: --ancestry-pathJunio C Hamano2010-04-211-0/+56
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-06-222-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2010-06-221-0/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-221-2/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-221-0/+68
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-221-0/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-222-0/+82
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano2010-06-221-7/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-221-8/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-221-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-221-0/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-221-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expressionJunio C Hamano2010-06-212-3/+3