summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-tree: fix where two branches share no changesWill Palmer2010-07-142-4/+5
* add basic tests for merge-treeWill Palmer2010-07-141-0/+257
* git fetch documentation: describe short '-p' synonym to '--prune' optionOren Held2010-07-131-0/+1
* format-patch: document the format.to configuration settingMiklos Vajna2010-07-131-2/+4
* Documentation: Spelling fix in protocol-capabilities.txtFredrik Skolmli2010-07-091-1/+1
* checkout: accord documentation to what git doesNicolas Sebrecht2010-07-091-1/+1
* t0005: work around strange $? in ksh when program terminated by a signalJohannes Sixt2010-07-091-0/+1
* backmerge a few more fixes to 1.7.1.X seriesJunio C Hamano2010-07-072-1/+20
* Merge branch 'maint-1.6.4' into maintJunio C Hamano2010-07-072-2/+20
|\
| * rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-optionUwe Kleine-König2010-07-072-2/+20
* | Merge branch 'mg/doc-rev-parse-treepath-syntax' into maintJunio C Hamano2010-07-071-6/+9
|\ \
| * | git-rev-parse.txt: Add more examples for caret and colonMichael J Gruber2010-06-291-7/+8
| * | git-rev-parse.txt: Document ":path" specifierMichael J Gruber2010-06-271-1/+3
* | | Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano2010-07-072-37/+140
|\ \ \
| * | | check_aliased_update: strcpy() instead of strcat() to copyThomas Rast2010-06-111-2/+2
| * | | receive-pack: detect aliased updates which can occur with symrefsJay Soffian2010-04-192-4/+113
| * | | receive-pack: switch global variable 'commands' to a parameterJay Soffian2010-04-191-33/+27
* | | | fix git branch -m in presence of cross devicesPierre Habouzit2010-07-071-6/+15
* | | | 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
|\ \ \ \ \ \ \
View Lorry Controller Status