summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: remove stale commented debugging codesb/merge-recursive-copy-paste-fixStefan Beller2014-09-231-4/+0
* merge-recursive: fix copy-paste mistakeStefan Beller2014-09-231-1/+1
* Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-022-3/+50
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-028-2/+143
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | completion: Add --signature and format.signatureStephen Boyd2010-06-161-1/+2
| * | | | | | | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-165-3/+83
* | | | | | | | | Merge branch 'mg/pretty-magic-space'Junio C Hamano2010-06-223-4/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber2010-06-163-3/+24
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jn/gitweb-return-or-exit-cleanup'Junio C Hamano2010-06-221-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: Return or exit after done serving requestJakub Narebski2010-06-141-1/+9
* | | | | | | | | | Merge branch 'bd/maint-unpack-trees-parawalk-fix'Junio C Hamano2010-06-221-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unpack-trees: Make index lookahead less pessimalBrian Downing2010-06-181-2/+10
* | | | | | | | | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-224-66/+264
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/revert: describe passing more than one commitChristian Couder2010-06-021-14/+37
| * | | | | | | | | | | Documentation/cherry-pick: describe passing more than one commitChristian Couder2010-06-021-11/+53
| * | | | | | | | | | | revert: add tests to check cherry-picking many commitsChristian Couder2010-06-021-0/+95
| * | | | | | | | | | | revert: allow cherry-picking more than one commitChristian Couder2010-06-021-10/+41
| * | | | | | | | | | | revert: change help_msg() to take no argumentChristian Couder2010-06-021-4/+4
| * | | | | | | | | | | revert: refactor code into a do_pick_commit() functionChristian Couder2010-06-021-19/+25
| * | | | | | | | | | | revert: use run_command_v_opt() instead of execv_git_cmd()Christian Couder2010-06-021-2/+9
| * | | | | | | | | | | revert: cleanup code for -x optionChristian Couder2010-06-021-7/+1
* | | | | | | | | | | | Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano2010-06-224-3/+226
|\ \ \ \ \ \ \ \ \ \ \ \