summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add missing && to submodule-merge testcaseHeiko Voigt2010-07-061-1/+1
* test-date: fix sscanf type conversionJeff King2010-07-061-2/+2
* xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid2010-07-051-1/+3
* t0006: test timezone parsingJeff King2010-07-052-5/+9
* rerere.txt: Document forget subcommandMichael J Gruber2010-07-051-1/+6
* Documentation/git-gc.txt: add reference to githooksChris Packham2010-07-021-0/+7
* 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
* Update draft release notes to 1.7.1.1Junio C Hamano2010-06-281-1/+16
* Merge branch 'tr/send-email-8bit' into maintJunio C Hamano2010-06-283-0/+146
|\
| * send-email: ask about and declare 8bit mailsThomas Rast2010-06-183-0/+146
* | Merge branch 'pb/maint-perl-errmsg-no-dir' into maintJunio C Hamano2010-06-281-2/+2
|\ \
| * | Git.pm: better error messagePhilippe Bruhat (BooK)2010-06-181-2/+2
* | | Merge branch 'js/maint-am-rebase-invalid-author' into maintJunio C Hamano2010-06-282-6/+17
|\ \ \
| * | | am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-162-6/+17
* | | | Merge branch 'jc/maint-simpler-common-prefix' into maintJunio C Hamano2010-06-281-13/+13
|\ \ \ \
| * | | | common_prefix: simplify and fix scanning for prefixesJunio C Hamano2010-06-161-13/+13
| |/ / /
* | | | Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maintJunio C Hamano2010-06-281-2/+10
|\ \ \ \
| * | | | unpack-trees: Make index lookahead less pessimalBrian Downing2010-06-181-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: 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
* | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-221-0/+21
* | | | | Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2010-06-222-1/+12
|\ \ \ \ \
| * | | | | rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-112-1/+12
| |/ / / /
* | | | | Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-222-6/+13
|\ \ \ \ \
| * | | | | commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder2010-06-132-6/+13
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano2010-06-221-0/+7
|\ \ \ \ \
| * | | | | commit: give advice on empty amendJeff King2010-06-111-0/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-222-6/+72
|\ \ \ \ \
| * | | | | commit::print_summary(): don't use format_commit_message()Tay Ray Chuan2010-06-132-8/+6
| * | | | | t7502-commit: add summary output tests for empty and merge commitsTay Ray Chuan2010-05-281-2/+27
| * | | | | t7502-commit: add tests for summary outputTay Ray Chuan2010-05-281-0/+43
* | | | | | Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-222-0/+33
|\ \ \ \ \ \
| * | | | | | rebase -i -p: document shortcomingsJonathan Nieder2010-06-112-0/+33
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jn/checkout-doc' into maintJunio C Hamano2010-06-221-23/+31
|\ \ \ \ \ \
| * | | | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-06-111-19/+21
| * | | | | | Documentation/checkout: clarify descriptionJonathan Nieder2010-05-311-11/+17
* | | | | | | Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-223-5/+98
|\ \ \ \ \ \ \
| * | | | | | | diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-063-6/+99
* | | | | | | | Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano2010-06-221-7/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | t9129: fix UTF-8 locale detectionJunio C Hamano2010-06-021-7/+13
* | | | | | | | | Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-224-71/+110
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-files: allow relative pathspecClemens Buchacher2010-06-052-42/+45
| * | | | | | | | | quote.c: separate quoting and relative path generationClemens Buchacher2010-06-052-29/+65
* | | | | | | | | | Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-225-41/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-104-9/+21
| * | | | | | | | | | fmt-merge-msg: add function to append shortlog onlyTay Ray Chuan2010-05-102-4/+10