summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-06-26Git 1.7.6v1.7.6Junio C Hamano3-8/+7
2011-06-26Merge branch 'maint'Junio C Hamano1-1/+1
2011-06-24Merge branch 'maint-1.7.4' into maintJunio C Hamano1-1/+1
2011-06-24completion: replace core.abbrevguard to core.abbrevNamhyung Kim1-1/+1
2011-06-22Git 1.7.6-rc3v1.7.6-rc3Junio C Hamano1-1/+1
2011-06-22Merge branch 'maint'Junio C Hamano1-4/+8
2011-06-22Documentation: git diff --check respects core.whitespaceChristof Krüger1-4/+8
2011-06-21Merge branch 'maint'Junio C Hamano1-0/+2
2011-06-21gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabledJakub Narebski1-0/+2
2011-06-20Merge branch 'mk/grep-pcre'Junio C Hamano1-3/+3
2011-06-20t7810: avoid unportable use of "echo"Junio C Hamano1-3/+3
2011-06-20plug a few coverity-spotted leaksJim Meyering4-5/+12
2011-06-19Merge branch 'di/no-no-existant'Junio C Hamano7-14/+14
2011-06-19Merge branch 'maint'Junio C Hamano1-1/+1
2011-06-19builtin/gc.c: add missing newline in messageAndreas Schwab1-1/+1
2011-06-17tests: link shell libraries into valgrind directoryJeff King1-2/+7
2011-06-17t/Makefile: pass test opts to valgrind target properlyJeff King1-1/+1
2011-06-17Merge branch 'ab/i18n-scripts-basic'Junio C Hamano1-1/+0
2011-06-17sh-i18n--envsubst.c: do not #include getopt.hBrandon Casey1-1/+0
2011-06-16Fix typo: existant->existentDmitry Ivankov7-14/+14
2011-06-16Git 1.7.6-rc2v1.7.6-rc2Junio C Hamano2-2/+2
2011-06-09gitweb: do not misparse nonnumeric content tag files that contain a digitJonathan Nieder2-1/+9
2011-06-08Git 1.7.6-rc1v1.7.6-rc1Junio C Hamano2-3/+11
2011-06-08Merge branch 'maint'Junio C Hamano1-2/+4
2011-06-08fetch: do not leak a refspecJim Meyering1-2/+4
2011-06-07Merge branch 'jc/magic-pathspec'Junio C Hamano1-6/+6
2011-06-07t3703: skip more tests using colons in file names on WindowsAlex Riesen1-6/+6
2011-06-06Merge branch 'jn/mime-type-with-params'Junio C Hamano1-1/+1
2011-06-06Merge branch 'jn/gitweb-docs'Junio C Hamano2-131/+135
2011-06-06Merge branch 'jk/diff-not-so-quick'Junio C Hamano5-5/+16
2011-06-06Merge branch 'bc/maint-status-z-to-use-porcelain'Junio C Hamano2-3/+11
2011-06-05gitweb: Fix usability of $prevent_xssJakub Narebski1-1/+1
2011-06-03gitweb: Move "Requirements" up in gitweb/INSTALLJakub Narebski1-15/+15
2011-06-02gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALLJakub Narebski1-6/+13
2011-06-02gitweb: Move information about installation from README to INSTALLJakub Narebski2-116/+113
2011-06-01Sync with 1.7.5.4v1.7.6-rc0Junio C Hamano2-1/+5
2011-06-01Git 1.7.5.4v1.7.5.4Junio C Hamano3-2/+6
2011-06-01Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano4-48/+30
2011-06-01Merge branch 'jc/fmt-req-fix' into maintJunio C Hamano1-1/+1
2011-06-01Merge branch 'jk/maint-docs' into maintJunio C Hamano4-15/+35
2011-06-01Merge branch 'jn/doc-remote-helpers' into maintJunio C Hamano1-3/+3
2011-06-01Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano1-0/+1
2011-06-01diffcore-rename.c: avoid set-but-not-used warningJim Meyering1-2/+1
2011-05-31Update draft release notes to 1.7.6Junio C Hamano1-10/+13
2011-05-31Merge branch 'jk/format-patch-am'Junio C Hamano13-92/+174
2011-05-31Merge branch 'jn/doc-remote-helpers'Junio C Hamano1-3/+3
2011-05-31Merge branch 'jk/format-patch-empty-prefix'Junio C Hamano2-1/+20
2011-05-31Merge branch 'ab/i18n-envsubst-doc-fix'Junio C Hamano1-0/+10
2011-05-31Merge branch 'jc/log-quiet-fix'Junio C Hamano1-0/+2
2011-05-31Merge branch 'kk/maint-prefix-in-config-mak'Junio C Hamano1-0/+1
2011-05-31Merge branch 'jk/rebase-head-reflog'Junio C Hamano3-4/+8
2011-05-31Merge branch 'jk/maint-docs'Junio C Hamano4-15/+35
2011-05-31Merge branch 'jk/read-in-full-stops-on-error'Junio C Hamano1-2/+4
2011-05-31Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2-2/+24
2011-05-31Merge branch 'jl/read-tree-m-dry-run'Junio C Hamano14-143/+202
2011-05-31Sync with maintJunio C Hamano1-0/+18
2011-05-31Start 1.7.5.4 draft release notesJunio C Hamano2-1/+19
2011-05-31Merge branch 'tr/add-i-no-escape' into maintJunio C Hamano1-0/+19
2011-05-31Merge branch 'vh/config-interactive-singlekey-doc' into maintJunio C Hamano5-13/+21
2011-05-31Merge branch 'ml/test-readme' into maintJunio C Hamano1-8/+9
2011-05-31Merge branch 'ab/i18n-fixup' into maintJunio C Hamano40-383/+375
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano8-40/+152
2011-05-31Merge branch 'rr/doc-content-type' into maintJunio C Hamano2-62/+103
2011-05-31config.c: Remove unused git_config_global() functionRamsay Jones1-5/+0
2011-05-31diff: futureproof "stop feeding the backend early" logicJunio C Hamano4-6/+11
2011-05-31diff_tree: disable QUICK optimization with diff filterJeff King2-0/+6
2011-05-30Merge branch 'jc/fmt-req-fix'Junio C Hamano1-1/+1
2011-05-30Merge branch 'jk/maint-config-alias-fix'Junio C Hamano4-45/+32
2011-05-30Documentation: do not misinterpret refspecs as bold textJonathan Nieder1-3/+3
2011-05-30format-patch: make zero-length subject prefixes prettierJeff King2-1/+20
2011-05-30git-sh-i18n--envsubst: add SYNOPSIS section to the documentationÆvar Arnfjörð Bjarmason1-0/+10
2011-05-30Merge branch 'maint'Junio C Hamano6-8/+14
2011-05-30Merge branch 'jm/maint-misc-fix' into maintJunio C Hamano4-5/+11
2011-05-30Merge branch 'bc/maint-submodule-fix-parked' into maintJunio C Hamano1-1/+1
2011-05-30Merge branch 'bc/maint-api-doc-parked' into maintJunio C Hamano1-2/+2
2011-05-30Merge branch 'mk/grep-pcre'Junio C Hamano11-30/+347
2011-05-29git-grep: Fix problems with recently added testsMichał Kiedrowicz1-32/+26
2011-05-29Merge branch 'jc/notes-batch-removal'Junio C Hamano8-28/+151
2011-05-29Merge branch 'jk/haves-from-alternate-odb'Junio C Hamano8-63/+132
2011-05-29Merge branch 'jn/run-command-error-failure' into maintJunio C Hamano3-6/+34
2011-05-29builtin/commit.c: set status_format _after_ option parsingBrandon Casey2-4/+5
2011-05-29t7508: demonstrate status's failure to use --porcelain format with -zBrandon Casey1-0/+7
2011-05-28log: --quiet should serve as synonym to -sJunio C Hamano1-0/+2
2011-05-27rebase: write a reflog entry when finishingJeff King3-3/+7
2011-05-27rebase: create HEAD reflog entry when abortingCsaba Henk1-1/+1
2011-05-27config.mak.in: allow "configure --sysconfdir=/else/where"Junio C Hamano1-0/+1
2011-05-26docs: fix some antique example outputJeff King2-4/+4
2011-05-26docs: make sure literal "->" isn't converted to arrowJeff King2-5/+5
2011-05-26docs: update status --porcelain formatJeff King1-4/+23
2011-05-26docs: minor grammar fixes to git-statusJeff King1-3/+4
2011-05-26format-patch: preserve subject newlines with -kJeff King6-3/+8
2011-05-26clean up calling conventions for pretty.c functionsJeff King7-76/+75
2011-05-26pretty: add pp_commit_easy function for simple callersJeff King7-12/+14
2011-05-26git-submodule.sh: separate parens by a space to avoid confusing some shellsBrandon Casey1-1/+1
2011-05-26Documentation/technical/api-diff.txt: correct name of diff_unmerge()Brandon Casey1-2/+2
2011-05-26mailinfo: always clean up rfc822 header foldingJeff King2-2/+2
2011-05-26t: test subject handling in format-patch / am pipelineJeff King1-0/+77
2011-05-26read_in_full: always report errorsJeff King1-2/+4
2011-05-26remote: allow "-t" with fetch mirrorsJeff King2-2/+24
2011-05-26read_gitfile_gently: use ssize_t to hold read resultJeff King1-1/+1
2011-05-26remove tests of always-false conditionJim Meyering2-2/+2
2011-05-26plug a DIR buffer leak in rerere.cJim Meyering1-0/+1
2011-05-26rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'Jim Meyering1-2/+8
2011-05-26Update 1.7.6 draft release notesJunio C Hamano1-35/+15
2011-05-26Merge branch 'jn/userdiff-perl-updates'Junio C Hamano3-38/+152
2011-05-26Merge branch 'rg/no-gecos-in-pwent'Junio C Hamano2-1/+10
2011-05-26Merge branch 'jk/fetch-mark-complete-optimization'Junio C Hamano1-2/+4
2011-05-26Merge branch 'jn/gitweb-js'Junio C Hamano11-241/+1023
2011-05-26Merge branch 'jn/ctags-more'Junio C Hamano4-46/+152
2011-05-26Merge branch 'jc/require-work-tree-exists'Junio C Hamano2-3/+15
2011-05-26Sync with 1.7.5.3Junio C Hamano3-105/+36
2011-05-26Git 1.7.5.3v1.7.5.3Junio C Hamano4-3/+36
2011-05-26Merge branch 'maint-1.7.4' into maintJunio C Hamano0-0/+0
2011-05-26Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4Junio C Hamano4-14/+67
2011-05-26Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4Junio C Hamano1-2/+7
2011-05-26Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4Junio C Hamano1-12/+11
2011-05-26Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2-2/+36
2011-05-26Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano1-9/+9
2011-05-26Merge branch 'mg/diff-uiconfig-doc' into maintJunio C Hamano2-12/+30
2011-05-26Merge branch 'ft/gitweb-tar-with-gzip-n' into maintJunio C Hamano1-1/+1
2011-05-26Merge branch 'ss/doc-svn' into maintJunio C Hamano1-9/+7
2011-05-26Merge branch 'jn/format-patch-doc' into maintJunio C Hamano4-195/+229
2011-05-26Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maintJunio C Hamano2-52/+45
2011-05-26Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano3-7/+36
2011-05-26Merge branch 'rg/copy-gecos-username' into maintJunio C Hamano1-0/+1
2011-05-26Merge branch 'fc/completion-zsh' into maintJunio C Hamano1-0/+8
2011-05-26Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano4-14/+67
2011-05-26Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maintJunio C Hamano1-2/+7
2011-05-26compat/fnmatch/fnmatch.c: give a fall-back definition for NULLJunio C Hamano1-0/+4
2011-05-26Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maintJunio C Hamano1-104/+2
2011-05-25Merge branch 'jc/bigfile'Junio C Hamano7-31/+164
2011-05-25Merge branch 'js/log-abbrev-commit-config'Junio C Hamano6-9/+85
2011-05-25Merge branch 'maint'Junio C Hamano6-8/+6
2011-05-25Teach read-tree the -n|--dry-run optionJens Lehmann12-140/+198
2011-05-25unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann2-3/+4
2011-05-25userformat_find_requirements(): find requirement for the correct formatJunio C Hamano1-1/+1
2011-05-25gitweb: Refactor reading and parsing config file into read_config_fileJakub Narebski1-8/+20
2011-05-25sh-18n: quell "unused variable" warningMichael J Gruber1-2/+2
2011-05-25init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy6-8/+6
2011-05-24handle_options(): do not miscount how many arguments were usedJunio C Hamano2-5/+3
2011-05-24config: always parse GIT_CONFIG_PARAMETERS during git_configJeff King2-40/+18
2011-05-24git_config: don't peek at global config_parametersJeff King1-4/+11
2011-05-24config: make environment parsing routines staticJeff King2-4/+2
2011-05-24doc: discuss textconv versus external diff driversJeff King1-0/+31
2011-05-24require-work-tree wants more than what its name saysJunio C Hamano2-3/+15
2011-05-24gitweb: Make JavaScript ability to adjust timezones configurableJakub Narebski1-8/+31
2011-05-24gitweb.js: Add UI for selecting common timezone to display datesJohn 'Warthog9' Hawley4-16/+345
2011-05-24gitweb: JavaScript ability to adjust time based on timezoneJohn 'Warthog9' Hawley4-3/+84
2011-05-24gitweb: Unify the way long timestamp is displayedJakub Narebski1-5/+3
2011-05-24gitweb: Refactor generating of long dates into format_timestamp_htmlJakub Narebski1-23/+22
2011-05-24gitweb.js: Provide getElementsByClassName method (if it not exists)Jakub Narebski1-0/+51
2011-05-24gitweb.js: Introduce code to handle cookies from JavaScriptJakub Narebski2-0/+115
2011-05-24gitweb.js: Extract and improve datetime handlingJakub Narebski3-51/+162
2011-05-24gitweb.js: Provide default values for padding in padLeftStr and padLeftJakub Narebski1-3/+11
2011-05-24gitweb.js: Update and improve comments in JavaScript filesJakub Narebski2-15/+19
2011-05-24gitweb: Split JavaScript for maintability, combining on buildJakub Narebski6-206/+269
2011-05-23git-grep: Update tests (mainly for -P)Michał Kiedrowicz1-0/+85
2011-05-23userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimitersJonathan Nieder2-3/+16
2011-05-23Update 1.7.6 draft release notesJunio C Hamano1-1/+29
2011-05-23Merge branch 'tr/add-i-no-escape'Junio C Hamano1-0/+19
2011-05-23Merge branch 'jm/maint-diff-words-with-sbe'Junio C Hamano2-2/+36
2011-05-23Merge branch 'js/mingw-shutdown'Junio C Hamano2-0/+10
2011-05-23Merge branch 'ms/ls-remote-exit-with-status'Junio C Hamano3-3/+40
2011-05-23Merge branch 'mg/config-symbolic-constants'Junio C Hamano4-21/+38
2011-05-23Merge branch 'ab/i18n-scripts-basic'Junio C Hamano7-1/+602
2011-05-23Merge branch 'jc/magic-pathspec'Junio C Hamano10-31/+276
2011-05-23Merge branch 'jk/blame-line-porcelain'Junio C Hamano4-10/+131
2011-05-21tests: make test_expect_code quieter on successJonathan Nieder1-4/+3
2011-05-21userdiff/perl: catch sub with brace on second lineJonathan Nieder2-5/+40
2011-05-21userdiff/perl: match full line of POD headersJonathan Nieder2-1/+5
2011-05-21userdiff/perl: anchor "sub" and "package" patterns on the leftJonathan Nieder2-5/+58
2011-05-21t4018 (funcname patterns): minor cleanupsJonathan Nieder1-24/+25
2011-05-21t4018 (funcname patterns): make configuration easier to trackJonathan Nieder1-7/+12
2011-05-21t4018 (funcname patterns): make .gitattributes state easier to trackJonathan Nieder1-2/+6
2011-05-20Merge branch 'maint'Junio C Hamano2-1/+16
2011-05-20do not read beyond end of malloc'd bufferJim Meyering2-2/+36
2011-05-20git-svn: Fix git svn log --show-commitMichael J Gruber2-1/+16
2011-05-19Update draft release notes to 1.7.6Junio C Hamano1-1/+22
2011-05-19Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano0-0/+0
2011-05-19Merge branch 'rg/copy-gecos-username'Junio C Hamano1-0/+1
2011-05-19Merge branch 'jl/submodule-conflicted-gitmodules'Junio C Hamano2-6/+117
2011-05-19Merge branch 'jc/replacing'Junio C Hamano8-23/+45
2011-05-19Merge branch 'nd/sparse-co-fix'Junio C Hamano2-33/+83
2011-05-19Merge branch 'ld/p4-preserve-user-names'Junio C Hamano3-38/+340
2011-05-19Merge branch 'ms/tagname-does-not-begin-with-dash'Junio C Hamano1-8/+18
2011-05-19Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano4-14/+67
2011-05-19Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano1-2/+2
2011-05-19Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano3-7/+36
2011-05-19Merge branch 'jc/maint-pathspec-stdin-and-cmdline'Junio C Hamano2-52/+45
2011-05-19Merge 1.7.5.2 inJunio C Hamano2-1/+513
2011-05-19Revert "Merge branch 'en/merge-recursive'"Junio C Hamano2-81/+6
2011-05-19Git 1.7.5.2v1.7.5.2Junio C Hamano2-2/+3
2011-05-19receive-pack: eliminate duplicate .have refsJeff King3-3/+35
2011-05-19bisect: refactor sha1_array into a generic sha1 listJeff King4-55/+78
2011-05-19refactor refs_from_alternate_cb to allow passing extra dataJeff King4-6/+20
2011-05-19Makefile: sort TEST_PROGRAMS listJeff King1-2/+2
2011-05-19fetch: avoid repeated commits in mark_completeJeff King1-2/+4
2011-05-19ident: add NO_GECOS_IN_PWENT for systems without pw_gecos in struct passwdRafael Gieschke2-1/+10
2011-05-19provide a copy of the LGPLv2.1Jonathan Nieder1-0/+511
2011-05-19show: --ignore-missingJunio C Hamano5-3/+21