aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano2010-06-30
|\
| * t4027,4041: Use test -s to test for an empty fileBrian Gernhardt2010-06-25
| * Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann2010-06-11
| * git diff: rename test that had a conflicting nameJens Lehmann2010-06-11
* | Sync with 1.7.1.1Junio C Hamano2010-06-29
|\ \
| * | Git 1.7.1.1v1.7.1.1Junio C Hamano2010-06-29
| * | t/t9001: use egrep when regular expressions are involvedBrandon Casey2010-06-29
* | | Merge branch 'maint'Junio C Hamano2010-06-28
|\ \ \ | |/ /
| * | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-28
| * | Merge branch 'tr/send-email-8bit' into maintJunio C Hamano2010-06-28
| |\ \
| * \ \ Merge branch 'pb/maint-perl-errmsg-no-dir' into maintJunio C Hamano2010-06-28
| |\ \ \
| * \ \ \ Merge branch 'js/maint-am-rebase-invalid-author' into maintJunio C Hamano2010-06-28
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-simpler-common-prefix' into maintJunio C Hamano2010-06-28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maintJunio C Hamano2010-06-28
| |\ \ \ \ \ \
| * | | | | | | notes: Initialise variable to appease gccRamsay Jones2010-06-28
| * | | | | | | notes: check number of parameters to "git notes copy"Jeff King2010-06-28
* | | | | | | | msvc: Select the "fast" definition of the {get,put}_be32() macrosRamsay Jones2010-06-27
* | | | | | | | Git 1.7.2-rc0v1.7.2-rc0Junio C Hamano2010-06-27
* | | | | | | | Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-27
|\ \ \ \ \ \ \ \
| * | | | | | | | git-cat-file.txt: Document --textconvMichael J Gruber2010-06-24
| * | | | | | | | t/t8007: test textconv support for cat-fileClément Poulain2010-06-18
| * | | | | | | | textconv: support for cat_fileClément Poulain2010-06-18
| * | | | | | | | sha1_name: add get_sha1_with_context()Clément Poulain2010-06-18
* | | | | | | | | Merge branch 'pb/maint-perl-errmsg-no-dir'Junio C Hamano2010-06-27
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Git.pm: better error messagePhilippe Bruhat (BooK)2010-06-18
* | | | | | | | | Merge branch 'tr/send-email-8bit'Junio C Hamano2010-06-27
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | send-email: ask about and declare 8bit mailsThomas Rast2010-06-18
* | | | | | | | | Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-27
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-16
* | | | | | | | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-27
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | t/t8006: test textconv support for blameAxel Bonnet2010-06-18
| * | | | | | | | textconv: support for blameAxel Bonnet2010-06-18
| * | | | | | | | textconv: make the API publicAxel Bonnet2010-06-11
* | | | | | | | | Merge branch 'jn/show-num-walks'Junio C Hamano2010-06-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | DWIM 'git show -5' to 'git show --do-walk -5'Jonathan Nieder2010-06-02
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-06-25
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | msvc: Fix some compiler warningsRamsay Jones2010-06-25
| * | | | | | | | | Documentation: grep: fix asciidoc problem with --Christian Couder2010-06-25
| * | | | | | | | | msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones2010-06-24
* | | | | | | | | | Merge branch 'jk/url-decode'Junio C Hamano2010-06-23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | url.c: "<scheme>://" part at the beginning should not be URL decodedJunio C Hamano2010-06-23
* | | | | | | | | | | Update draft release notes to 1.7.2Junio C Hamano2010-06-22
* | | | | | | | | | | Merge branch 'jc/maint-simpler-common-prefix'Junio C Hamano2010-06-22
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | common_prefix: simplify and fix scanning for prefixesJunio C Hamano2010-06-16
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: Add --signature and format.signatureStephen Boyd2010-06-16
| * | | | | | | | | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-16
* | | | | | | | | | | Merge branch 'mg/pretty-magic-space'Junio C Hamano2010-06-22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber2010-06-16
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jn/gitweb-return-or-exit-cleanup'Junio C Hamano2010-06-22
|\ \ \ \ \ \ \ \ \ \ \