summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'as/maint-completion-set-u-fix'Junio C Hamano2010-06-301-7/+7
|\
| * bash-completion: Fix __git_ps1 to work with "set -u"Andrew Sayers2010-06-181-7/+7
* | 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-305-5/+116
|\ \ \
| * | | 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-116-6/+118
| * | | git diff: rename test that had a conflicting nameJens Lehmann2010-06-111-0/+0
* | | | Sync with 1.7.1.1Junio C Hamano2010-06-292-13/+6
|\ \ \ \
| * | | | Git 1.7.1.1v1.7.1.1Junio C Hamano2010-06-292-11/+4
| * | | | t/t9001: use egrep when regular expressions are involvedBrandon Casey2010-06-291-3/+3
* | | | | Merge branch 'maint'Junio C Hamano2010-06-294-2/+27
|\| | | |
| * | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-291-1/+16
| * | | | Merge branch 'tr/send-email-8bit' into maintJunio C Hamano2010-06-293-0/+146
| |\ \ \ \
| * \ \ \ \ Merge branch 'pb/maint-perl-errmsg-no-dir' into maintJunio C Hamano2010-06-291-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/maint-am-rebase-invalid-author' into maintJunio C Hamano2010-06-292-6/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-simpler-common-prefix' into maintJunio C Hamano2010-06-291-13/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maintJunio C Hamano2010-06-291-2/+10
| |\ \ \ \ \ \ \ \
| * | | | | | | | | notes: Initialise variable to appease gccRamsay Jones2010-06-281-1/+1
| * | | | | | | | | notes: check number of parameters to "git notes copy"Jeff King2010-06-282-0/+10
* | | | | | | | | | msvc: Select the "fast" definition of the {get,put}_be32() macrosRamsay Jones2010-06-281-0/+1
* | | | | | | | | | Git 1.7.2-rc0v1.7.2-rc0Junio C Hamano2010-06-271-1/+11
* | | | | | | | | | Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-277-15/+155
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-cat-file.txt: Document --textconvMichael J Gruber2010-06-241-2/+8
| * | | | | | | | | | t/t8007: test textconv support for cat-fileClément Poulain2010-06-181-0/+70
| * | | | | | | | | | textconv: support for cat_fileClément Poulain2010-06-183-8/+40
| * | | | | | | | | | sha1_name: add get_sha1_with_context()Clément Poulain2010-06-182-5/+37
* | | | | | | | | | | Merge branch 'pb/maint-perl-errmsg-no-dir'Junio C Hamano2010-06-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Git.pm: better error messagePhilippe Bruhat (BooK)2010-06-181-2/+2
* | | | | | | | | | | Merge branch 'tr/send-email-8bit'Junio C Hamano2010-06-273-0/+146
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | send-email: ask about and declare 8bit mailsThomas Rast2010-06-183-0/+146
* | | | | | | | | | | Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-272-6/+17
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-162-6/+17
* | | | | | | | | | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-274-21/+165
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | t/t8006: test textconv support for blameAxel Bonnet2010-06-181-0/+80
| * | | | | | | | | | textconv: support for blameAxel Bonnet2010-06-181-13/+72
| * | | | | | | | | | textconv: make the API publicAxel Bonnet2010-06-112-8/+12
* | | | | | | | | | | Merge branch 'jn/show-num-walks'Junio C Hamano2010-06-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | DWIM 'git show -5' to 'git show --do-walk -5'Jonathan Nieder2010-06-021-0/+4
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-06-255-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | msvc: Fix some compiler warningsRamsay Jones2010-06-251-4/+4
| * | | | | | | | | | Documentation: grep: fix asciidoc problem with --Christian Couder2010-06-251-1/+1
| * | | | | | | | | | msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones2010-06-243-5/+5
* | | | | | | | | | | Merge branch 'jk/url-decode'Junio C Hamano2010-06-231-10/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | url.c: "<scheme>://" part at the beginning should not be URL decodedJunio C Hamano2010-06-231-10/+18
* | | | | | | | | | | | Update draft release notes to 1.7.2Junio C Hamano2010-06-221-12/+41
* | | | | | | | | | | | Merge branch 'jc/maint-simpler-common-prefix'Junio C Hamano2010-06-221-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | common_prefix: simplify and fix scanning for prefixesJunio C Hamano2010-06-161-13/+13
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-226-4/+85
|\ \ \ \ \ \ \ \ \ \ \