summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2010-06-30Git 1.7.2-rc1v1.7.2-rc1Junio C Hamano2-5/+12
2010-06-30git.spec.in: Add gitweb subpackageJunio C Hamano1-0/+15
2010-06-30Merge branch 'ar/decorate-color'Junio C Hamano6-8/+176
2010-06-30Merge branch 'mg/doc-rev-parse-treepath-syntax'Junio C Hamano1-6/+9
2010-06-30Merge branch 'cc/cherry-pick-stdin'Junio C Hamano4-25/+61
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano9-16/+177
2010-06-30Merge branch 'jk/url-decode'Junio C Hamano1-4/+4
2010-06-30Merge branch 'jn/grep-open'Junio C Hamano7-39/+276
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano29-147/+147
2010-06-30Merge branch 'tr/rev-list-count'Junio C Hamano6-1/+204
2010-06-30Merge branch 'as/maint-completion-set-u-fix'Junio C Hamano1-7/+7
2010-06-30Merge branch 'mg/rev-parse-tests'Junio C Hamano1-1/+16
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano5-5/+116
2010-06-30Add test for correct coloring of git log --decorationNazri Ramliy1-0/+66
2010-06-29Sync with 1.7.1.1Junio C Hamano2-13/+6
2010-06-29revert: do not rebuild argv on heapJonathan Nieder2-16/+34
2010-06-29Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdinJunio C Hamano4-2/+13
2010-06-29Git 1.7.1.1v1.7.1.1Junio C Hamano2-11/+4
2010-06-29t/t9001: use egrep when regular expressions are involvedBrandon Casey1-3/+3
2010-06-29git-rev-parse.txt: Add more examples for caret and colonMichael J Gruber1-7/+8
2010-06-28Merge branch 'maint'Junio C Hamano4-2/+27
2010-06-28Update draft release notes to 1.7.1.1Junio C Hamano1-1/+16
2010-06-28Merge branch 'tr/send-email-8bit' into maintJunio C Hamano3-0/+146
2010-06-28Merge branch 'pb/maint-perl-errmsg-no-dir' into maintJunio C Hamano1-2/+2
2010-06-28Merge branch 'js/maint-am-rebase-invalid-author' into maintJunio C Hamano2-6/+17
2010-06-28Merge branch 'jc/maint-simpler-common-prefix' into maintJunio C Hamano1-13/+13
2010-06-28Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maintJunio C Hamano1-2/+10
2010-06-28notes: Initialise variable to appease gccRamsay Jones1-1/+1
2010-06-28notes: check number of parameters to "git notes copy"Jeff King2-0/+10
2010-06-27msvc: Select the "fast" definition of the {get,put}_be32() macrosRamsay Jones1-0/+1
2010-06-27git-rev-parse.txt: Document ":path" specifierMichael J Gruber1-1/+3
2010-06-27Git 1.7.2-rc0v1.7.2-rc0Junio C Hamano1-1/+11
2010-06-27Merge branch 'cp/textconv-cat-file'Junio C Hamano7-15/+155
2010-06-27Merge branch 'pb/maint-perl-errmsg-no-dir'Junio C Hamano1-2/+2
2010-06-27Merge branch 'tr/send-email-8bit'Junio C Hamano3-0/+146
2010-06-27Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2-6/+17
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano4-21/+165
2010-06-27Merge branch 'jn/show-num-walks'Junio C Hamano1-0/+4
2010-06-27t6018: make sure all tested symbolic names are different revsMichael J Gruber1-1/+3
2010-06-27t6018: add tests for rev-list's --branches and --tagsMichael J Gruber1-0/+13
2010-06-27Merge branch 'jp/string-list-api-cleanup' into jn/grep-openJulian Phillips30-150/+150
2010-06-27string_list: Fix argument order for string_list_appendJulian Phillips16-64/+64
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips11-17/+17
2010-06-27string_list: Fix argument order for string_list_insert_at_indexJulian Phillips3-6/+6
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips19-40/+40
2010-06-27string_list: Fix argument order for for_each_string_listJulian Phillips7-18/+18
2010-06-27string_list: Fix argument order for print_string_listJulian Phillips2-2/+2
2010-06-25Merge branch 'maint'Junio C Hamano5-10/+10
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann8-13/+174
2010-06-25git submodule: ignore dirty submodules for summary and statusJens Lehmann1-3/+3
2010-06-25msvc: Fix some compiler warningsRamsay Jones1-4/+4
2010-06-25t4027,4041: Use test -s to test for an empty fileBrian Gernhardt2-13/+13
2010-06-25Documentation: grep: fix asciidoc problem with --Christian Couder1-1/+1
2010-06-25revert: accept arbitrary rev-list optionsChristian Couder3-1/+19
2010-06-24url_decode: URL scheme ends with a colon and does not require a slashJunio C Hamano1-4/+4
2010-06-24git-cat-file.txt: Document --textconvMichael J Gruber1-2/+8
2010-06-24Allow customizable commit decorations colorsNazri Ramliy4-0/+45
2010-06-24bash completion: Support "divergence from upstream" messages in __git_ps1Andrew Sayers1-1/+143
2010-06-24msvc: Fix some "expr evaluates to function" compiler warningsRamsay Jones3-5/+5
2010-06-23Merge branch 'jk/url-decode'Junio C Hamano1-10/+18
2010-06-23url.c: "<scheme>://" part at the beginning should not be URL decodedJunio C Hamano1-10/+18
2010-06-22Update draft release notes to 1.7.2Junio C Hamano1-12/+41
2010-06-22Merge branch 'jc/maint-simpler-common-prefix'Junio C Hamano1-13/+13
2010-06-22Merge branch 'sb/format-patch-signature'Junio C Hamano6-4/+85
2010-06-22Merge branch 'mg/pretty-magic-space'Junio C Hamano3-4/+25
2010-06-22Merge branch 'jn/gitweb-return-or-exit-cleanup'Junio C Hamano1-0/+9
2010-06-22Merge branch 'bd/maint-unpack-trees-parawalk-fix'Junio C Hamano1-2/+10
2010-06-22Merge branch 'cc/cherry-pick-series'Junio C Hamano4-66/+264
2010-06-22Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano4-3/+226
2010-06-22Merge branch 'lt/extended-sha1-match-commit-with-regexp'Junio C Hamano1-3/+9
2010-06-22Merge branch 'maint'Junio C Hamano4-4/+24
2010-06-22Update draft release notes to 1.7.1.1Junio C Hamano1-0/+21
2010-06-22Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2-1/+12
2010-06-22Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2-6/+13
2010-06-22Merge branch 'jk/maint-advice-empty-amend' into maintJunio C Hamano1-0/+7
2010-06-22Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2-6/+72
2010-06-22Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2-0/+33
2010-06-22Merge branch 'jn/checkout-doc' into maintJunio C Hamano1-23/+31
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano3-5/+98
2010-06-22Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano1-7/+13
2010-06-22Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano4-71/+110
2010-06-22Merge branch 'tc/merge-m-log' into maintJunio C Hamano5-41/+87
2010-06-22Merge branch 'ph/clone-message-reword' into maintJunio C Hamano1-1/+2
2010-06-22Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2-7/+59
2010-06-22Merge branch 'pc/remove-warn' into maintJunio C Hamano6-21/+68
2010-06-21tests: remove unnecessary '^' from 'expr' regular expressionJunio C Hamano2-3/+3
2010-06-21t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" scriptBrandon Casey1-5/+0
2010-06-21t/t7811-grep-open.sh: ensure fake "less" is made executableBrandon Casey1-1/+2
2010-06-21t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expressionBrandon Casey1-1/+1
2010-06-21Merge branch 'js/maint-receive-pack-symref-alias'Junio C Hamano0-0/+0
2010-06-21Merge branch 'cc/maint-commit-reflog-msg'Junio C Hamano2-6/+13
2010-06-21Merge branch 'ic/maint-rebase-i-abort'Junio C Hamano2-1/+12
2010-06-21Merge branch 'jk/maint-advice-empty-amend'Junio C Hamano1-0/+7
2010-06-21Merge branch 'eb/core-eol'Junio C Hamano12-110/+570
2010-06-21Merge branch 'fg/autocrlf'Junio C Hamano2-0/+101
2010-06-21Merge branch 'sm/branch-broken-ref'Junio C Hamano1-6/+22
2010-06-21Merge branch 'rr/parse-date-refactor'Junio C Hamano1-19/+37
2010-06-21Merge branch 'jn/document-rebase-i-p-limitation'Junio C Hamano2-0/+33
2010-06-21Merge branch 'tc/commit-abbrev-fix'Junio C Hamano2-6/+72
2010-06-21Merge branch 'tr/receive-pack-aliased-update-fix'Junio C Hamano1-2/+2
2010-06-21Merge branch 'gs/usage-to-stdout'Junio C Hamano5-43/+61
2010-06-21Merge branch 'js/async-thread'Junio C Hamano10-41/+117
2010-06-21Merge branch 'gv/portable'Junio C Hamano65-162/+378
2010-06-21Merge branch 'bc/portable'Junio C Hamano12-28/+63
2010-06-21Merge branch 'jn/gitweb-fastcgi'Junio C Hamano1-152/+258
2010-06-21Merge branch 'jn/checkout-doc'Junio C Hamano1-23/+31
2010-06-21Merge branch 'em/checkout-orphan'Junio C Hamano7-60/+168
2010-06-21Drop items that are 1.7.1.1 fixes from the 1.7.1 release notesJunio C Hamano1-21/+0
2010-06-21Merge branch 'maint'Junio C Hamano1-0/+21
2010-06-21Update draft release notes to 1.7.1.1Junio C Hamano1-0/+21
2010-06-21Merge branch 'mc/maint-zoneparse' into maintJunio C Hamano1-1/+2
2010-06-21Merge branch 'jk/diff-m-doc' into maintJunio C Hamano1-0/+7
2010-06-21Merge branch 'jn/maint-doc-ignore' into maintJunio C Hamano1-5/+9
2010-06-21Merge branch 'bs/userdiff-php' into maintJunio C Hamano1-1/+3
2010-06-21Merge branch 'jk/maint-sha1-file-name-fix' into maintJunio C Hamano1-13/+15
2010-06-21Merge branch 'jk/maint-pull-dry-run-noop' into maintJunio C Hamano1-1/+6
2010-06-21Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano1-26/+35
2010-06-21Merge branch 'cb/assume-unchanged-fix' into maintJunio C Hamano3-3/+25
2010-06-21Merge branch 'jn/notes-doc' into maintJunio C Hamano4-35/+238
2010-06-21Merge branch 'ab/test-cleanup' into maintJunio C Hamano5-5/+7
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano7-11/+11
2010-06-21Merge branch 'bg/apply-blank-trailing-context' into maintJunio C Hamano2-6/+18
2010-06-20Merge branch 'maint'Junio C Hamano1-1/+1
2010-06-20git-cvsserver: fix error for invalid password formatsÆvar Arnfjörð Bjarmason1-1/+4
2010-06-20git-cvsserver: typo in a comment: bas -> hasÆvar Arnfjörð Bjarmason1-1/+1
2010-06-20log --decorate: Colorize commit decorationsNazri Ramliy1-1/+33
2010-06-20log-tree.c: Use struct name_decoration's type for classifying decorationNazri Ramliy1-8/+32
2010-06-20commit.h: add 'type' to struct name_decorationNazri Ramliy1-0/+1
2010-06-20gitweb/Makefile: fix typo in gitweb.min.css ruleJay Soffian1-1/+1
2010-06-18t/t8007: test textconv support for cat-fileClément Poulain1-0/+70
2010-06-18textconv: support for cat_fileClément Poulain3-8/+40
2010-06-18Update draft release notes to 1.7.2Junio C Hamano1-4/+33
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano3-5/+98
2010-06-18Merge branch 'by/diff-graph'Junio C Hamano4-97/+342
2010-06-18Merge branch 'cb/ls-files-cdup'Junio C Hamano4-71/+110
2010-06-18Merge branch 'jc/t9129-any-utf8'Junio C Hamano1-7/+13
2010-06-18Merge branch 'rr/am-help'Junio C Hamano1-10/+19
2010-06-18Merge branch 'jn/rebase-cmdline-fix'Junio C Hamano2-10/+20
2010-06-18Merge branch 'ps/gitweb--browse-chrome'Junio C Hamano1-2/+7
2010-06-18Merge branch 'jk/am-skip-hint'Junio C Hamano1-0/+2
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano2-3/+38
2010-06-18Merge branch 'ab/maint-perl-use-instlibdir'Junio C Hamano1-2/+1
2010-06-18Merge branch 'ec/diff-noprefix-config'Junio C Hamano2-1/+10
2010-06-18Merge branch 'mg/status-b'Junio C Hamano5-8/+130
2010-06-18Merge branch 'jn/gitweb-plackup'Junio C Hamano11-105/+257
2010-06-18Merge branch 'jk/url-decode'Junio C Hamano7-106/+153
2010-06-18Merge branch 'jn/remote-set-branches'Junio C Hamano3-11/+192
2010-06-18Merge branch 'rc/ls-remote-default'Junio C Hamano2-5/+29
2010-06-18Merge branch 'hg/id-munging'Junio C Hamano2-8/+36
2010-06-18Merge branch 'tc/merge-m-log'Junio C Hamano5-41/+87
2010-06-18Merge branch 'ph/clone-message-reword'Junio C Hamano1-1/+2
2010-06-18t/t8006: test textconv support for blameAxel Bonnet1-0/+80
2010-06-18sha1_name: add get_sha1_with_context()Clément Poulain2-5/+37
2010-06-18textconv: support for blameAxel Bonnet1-13/+72
2010-06-18bash-completion: Fix __git_ps1 to work with "set -u"Andrew Sayers1-7/+7
2010-06-18Git.pm: better error messagePhilippe Bruhat (BooK)1-2/+2
2010-06-18send-email: ask about and declare 8bit mailsThomas Rast3-0/+146
2010-06-18unpack-trees: Make index lookahead less pessimalBrian Downing1-2/+10
2010-06-16Update draft release notes to 1.7.2Junio C Hamano1-25/+1
2010-06-16Merge 'maint' updates inJunio C Hamano2-1/+47
2010-06-16Prepare draft release notes to 1.7.1.1Junio C Hamano2-1/+47
2010-06-16Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-...Junio C Hamano1-2/+2
2010-06-16Merge branch 'cw/maint-exec-defpath' into maintJunio C Hamano5-1/+28
2010-06-16Merge branch 'sc/http-late-auth' into maintJunio C Hamano3-2/+24
2010-06-16Merge branch 'by/blame-doc-m-c' into maintJunio C Hamano1-4/+6
2010-06-16Merge branch 'cb/maint-stash-orphaned-file' into maintJunio C Hamano2-1/+151
2010-06-16Merge branch 'mg/advice-statushints' into maintJunio C Hamano2-6/+60
2010-06-16Merge branch 'jn/maint-bundle' into maintJunio C Hamano2-2/+18
2010-06-16Merge branch 'rr/doc-submitting' into maintJunio C Hamano1-11/+38
2010-06-16Merge branch 'jn/t7006-fixup' into maintJunio C Hamano2-48/+117
2010-06-16Merge branch 'jn/shortlog' into maintJunio C Hamano6-29/+144
2010-06-16Merge branch 'np/index-pack-memsave' into maintJunio C Hamano1-44/+45
2010-06-16Merge branch 'sp/maint-dumb-http-pack-reidx' into maintJunio C Hamano8-60/+149
2010-06-16Merge branch 'jc/am-3-show-corrupted-patch' into maintJunio C Hamano1-1/+1
2010-06-16Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maintJunio C Hamano4-33/+97
2010-06-16Merge branch 'np/malloc-threading' into maintJunio C Hamano7-8/+54
2010-06-16Merge branch 'bg/send-email-smtpdomain' into maintJunio C Hamano3-26/+30
2010-06-16Merge branch 'rc/maint-curl-helper' into maintJunio C Hamano4-8/+38
2010-06-16Merge branch 'hg/maint-attr-fix' into maintJunio C Hamano2-14/+39
2010-06-16Merge branch 'mh/status-optionally-refresh' into maintJunio C Hamano2-0/+34
2010-06-16pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber3-3/+24
2010-06-16common_prefix: simplify and fix scanning for prefixesJunio C Hamano1-13/+13
2010-06-16completion: Add --signature and format.signatureStephen Boyd1-1/+2
2010-06-16format-patch: Add a signature option (--signature)Stephen Boyd5-3/+83
2010-06-16am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2-6/+17
2010-06-15notes: Initialize variable to appease Sun StudioÆvar Arnfjörð Bjarmason1-1/+1
2010-06-14gitweb: Return or exit after done serving requestJakub Narebski1-1/+9
2010-06-14t3508 (cherry-pick): futureproof against unmerged filesJonathan Nieder1-7/+7
2010-06-14Make :/ accept a regex rather than a fixed patternLinus Torvalds1-3/+9
2010-06-14Update draft release notes to 1.7.2Junio C Hamano1-11/+102
2010-06-14Merge git://git.bogomips.org/git-svnJunio C Hamano1-0/+4
2010-06-14git svn: avoid unnecessary '/' in paths for SVNEric Wong1-0/+3
2010-06-14git-svn: strip off leading slashes on --trunk argumentJonathan Nieder1-0/+1
2010-06-13Merge branch 'maint'Junio C Hamano1-4/+4
2010-06-13git-mailinfo documentation: clarify -u/--encodingZhang Le1-4/+4
2010-06-13Remove python 2.5'ismsBrandon Casey6-13/+39
2010-06-13Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONSBrandon Casey1-0/+1
2010-06-13Merge branch 'ab/cvsserver'Junio C Hamano3-12/+135
2010-06-13Merge branch 'mg/notes-dry-run'Junio C Hamano5-10/+72
2010-06-13Merge branch 'mc/maint-zoneparse'Junio C Hamano1-1/+2