summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-04-25Git 2.0-rc1v2.0.0-rc1Junio C Hamano2-1/+6
2014-04-24Merge branch 'jk/pack-bitmap'Junio C Hamano1-1/+1
2014-04-24Merge branch 'fc/transport-helper-sync-error-fix'Junio C Hamano2-37/+67
2014-04-24Merge branch 'db/make-with-curl'Junio C Hamano1-12/+33
2014-04-22ewah_bitmap.c: do not assume size_t and eword_t are the same sizeKyle J. McKay1-1/+1
2014-04-21Update draft release notes to 2.0Junio C Hamano1-3/+12
2014-04-21Merge git://bogomips.org/git-svnJunio C Hamano20-153/+131
2014-04-21Merge branch 'jx/i18n'Junio C Hamano5-15/+15
2014-04-21Merge branch 'km/avoid-non-function-return-in-rebase'Junio C Hamano4-10/+46
2014-04-21Merge branch 'ep/shell-command-substitution'Junio C Hamano14-48/+48
2014-04-21t5801 (remote-helpers): cleanup environment setsFelipe Contreras1-7/+4
2014-04-19Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not givenJohan Herland20-153/+131
2014-04-18Git 2.0-rc0v2.0.0-rc0Junio C Hamano2-1/+6
2014-04-18Merge branch 'jk/config-die-bad-number-noreturn'Junio C Hamano1-0/+1
2014-04-18Merge branch 'fc/remote-helper-fixes'Junio C Hamano5-5/+34
2014-04-18Merge branch 'fc/complete-aliased-push'Junio C Hamano2-0/+2
2014-04-18Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano1-7/+14
2014-04-18i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelinesJunio C Hamano1-0/+10
2014-04-17t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitutionElia Pinto1-2/+2
2014-04-17t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitutionElia Pinto1-7/+7
2014-04-17git-tag.sh: use the $( ... ) construct for command substitutionElia Pinto1-1/+1
2014-04-17git-revert.sh: use the $( ... ) construct for command substitutionElia Pinto1-1/+1
2014-04-17git-resolve.sh: use the $( ... ) construct for command substitutionElia Pinto1-1/+1
2014-04-17git-repack.sh: use the $( ... ) construct for command substitutionElia Pinto1-1/+1
2014-04-17git-merge.sh: use the $( ... ) construct for command substitutionElia Pinto1-2/+2
2014-04-17git-ls-remote.sh: use the $( ... ) construct for command substitutionElia Pinto1-2/+2
2014-04-17git-fetch.sh: use the $( ... ) construct for command substitutionElia Pinto1-3/+3
2014-04-17git-commit.sh: use the $( ... ) construct for command substitutionElia Pinto1-5/+5
2014-04-17git-clone.sh: use the $( ... ) construct for command substitutionElia Pinto1-10/+10
2014-04-17git-checkout.sh: use the $( ... ) construct for command substitutionElia Pinto1-4/+4
2014-04-17install-webdoc.sh: use the $( ... ) construct for command substitutionElia Pinto1-3/+3
2014-04-17howto-index.sh: use the $( ... ) construct for command substitutionElia Pinto1-6/+6
2014-04-17i18n: only extract comments marked with "TRANSLATORS:"Jiang Xin2-6/+4
2014-04-17i18n: remove obsolete comments for translators in diffstat generationJiang Xin1-8/+0
2014-04-17i18n: fix uncatchable comments for translators in date.cJiang Xin1-1/+1
2014-04-17Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"Kyle J. McKay1-10/+1
2014-04-17rebase: avoid non-function use of "return" on FreeBSDKyle J. McKay3-0/+45
2014-04-16Update draft release notes for 2.0Junio C Hamano1-0/+11
2014-04-16Merge branch 'mh/multimail'Junio C Hamano5-56/+249
2014-04-16Merge branch 'tb/unicode-6.3-zero-width'Junio C Hamano1-5/+4
2014-04-16Merge branch 'km/avoid-cp-a'Junio C Hamano1-2/+2
2014-04-16Merge branch 'km/avoid-bs-in-shell-glob'Junio C Hamano1-2/+2
2014-04-16config.c: mark die_bad_number as NORETURNJeff King1-0/+1
2014-04-15Makefile: allow static linking against libcurlDave Borowitz1-3/+13
2014-04-15Makefile: use curl-config to determine curl flagsDave Borowitz1-12/+23
2014-04-14transport-helper: fix sync issue on crashesFelipe Contreras2-3/+30
2014-04-14transport-helper: trivial cleanupFelipe Contreras1-12/+12
2014-04-14transport-helper: propagate recvline() error pushingFelipe Contreras1-7/+11
2014-04-14remote-helpers: make recvline return an errorFelipe Contreras1-7/+14
2014-04-14transport-helper: remove barely used xchgline()Felipe Contreras1-7/+2
2014-04-14prompt: fix missing file errors in zshFelipe Contreras1-7/+14
2014-04-14remote-bzr: trivial test fixFelipe Contreras1-1/+1
2014-04-11test: fix t5560 on FreeBSDKyle J. McKay1-2/+2
2014-04-11test: fix t7001 cp to use POSIX optionsKyle J. McKay1-2/+2
2014-04-09completion: fix completing args of aliased "push", "fetch", etc.Felipe Contreras2-0/+2
2014-04-09remote-bzr: include authors field in pushed commitsdequis2-0/+26
2014-04-09remote-bzr: add support for older versionsFelipe Contreras1-2/+2
2014-04-09remote-hg: always normalize pathsFelipe Contreras1-0/+1
2014-04-09remote-helpers: allow all tests running from any dirFelipe Contreras2-2/+4
2014-04-09Sync with 1.9.2Junio C Hamano3-2/+23
2014-04-09Git 1.9.2v1.9.2Junio C Hamano3-2/+23
2014-04-09Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano57-90/+88
2014-04-09Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2-6/+64
2014-04-09Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2-0/+12
2014-04-09Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano5-4/+47
2014-04-09Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maintJunio C Hamano1-1/+1
2014-04-09Merge commit 'doc/http-backend: missing accent grave in literal mark-up'Junio C Hamano1-1/+1
2014-04-09doc/http-backend: missing accent grave in literal mark-upThomas Ackermann1-1/+1
2014-04-09utf8.c: partially update to version 6.3Torsten Bögershausen1-5/+4
2014-04-08Update draft release notes to 2.0Junio C Hamano1-17/+11
2014-04-08Merge branch 'maint'Junio C Hamano1-0/+9
2014-04-08Update draft release notes to 1.9.2Junio C Hamano1-0/+9
2014-04-08Merge branch 'mm/status-porcelain-format-i18n-fix' into maintJunio C Hamano2-5/+9
2014-04-08Merge branch 'bp/commit-p-editor' into maintJunio C Hamano10-39/+137
2014-04-08Merge branch 'jk/pack-bitmap'Junio C Hamano6-6/+56
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano57-90/+88
2014-04-08Merge branch 'mh/update-ref-batch-create-fix'Junio C Hamano2-0/+12
2014-04-08Merge branch 'mr/opt-set-ptr'Junio C Hamano5-19/+4
2014-04-08Merge branch 'ib/rev-parse-parseopt-argh'Junio C Hamano1-1/+1
2014-04-08Merge branch 'mr/msvc-link-with-invalidcontinue'Junio C Hamano1-1/+1
2014-04-08Merge branch 'jc/rev-parse-argh-dashed-multi-words'Junio C Hamano17-29/+77
2014-04-08Merge branch 'jk/commit-dates-parsing-fix'Junio C Hamano5-4/+47
2014-04-07git-p4: explicitly specify that HEAD is a revisionVlad Dogaru1-1/+1
2014-04-07git-multimail: update to version 1.0.0Michael Haggerty5-56/+249
2014-04-04pack-objects: do not reuse packfiles without --delta-base-offsetJeff King1-1/+12
2014-04-04add `ignore_missing_links` mode to revwalkVicent Marti5-5/+44
2014-04-04MSVC: allow using ExtUtils::MakeMakerMarat Radchenko1-1/+0
2014-04-03Update draft release notes to 2.0Junio C Hamano1-0/+25
2014-04-03Merge branch 'maint'Junio C Hamano1-0/+38
2014-04-03Start preparing for 1.9.1Junio C Hamano2-1/+39
2014-04-03Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2-1/+21
2014-04-03Merge branch 'mh/remove-subtree-long-pathname-fix' into maintJunio C Hamano1-32/+32
2014-04-03Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano1-18/+19
2014-04-03Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano1-2/+2
2014-04-03Merge branch 'us/printf-not-echo' into maintJunio C Hamano2-3/+3
2014-04-03Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano1-2/+2
2014-04-03Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano5-56/+49
2014-04-03Merge branch 'jc/stash-pop-not-popped' into maintJunio C Hamano1-2/+8
2014-04-03Merge branch 'jn/wt-status' into maintJunio C Hamano3-55/+88
2014-04-03Merge branch 'nd/gc-aggressive'Junio C Hamano5-3/+17
2014-04-03Merge branch 'jc/fix-diff-no-index-diff-opt-parse'Junio C Hamano1-1/+1
2014-04-03Merge branch 'cb/aix'Junio C Hamano3-7/+5
2014-04-03Merge branch 'cn/fetch-prune-overlapping-destination'Junio C Hamano2-6/+64
2014-04-03Merge branch 'nd/log-show-linear-break'Junio C Hamano14-11/+89
2014-04-03Merge branch 'ep/shell-command-substitution'Junio C Hamano2-17/+17
2014-04-02Merge branch 'ap/remote-hg-skip-null-bookmarks'Junio C Hamano2-1/+77
2014-04-02Merge branch 'rs/pickaxe-i'Junio C Hamano2-188/+116
2014-04-02Revert part of 384364b (Start preparing for Git 2.0, 2014-03-07)Junio C Hamano1-5/+0
2014-04-02Revert "submodule: explicit local branch creation in module_clone"Junio C Hamano4-109/+26
2014-04-02update-ref: fail create operation over stdin if ref already existsAman Gupta2-0/+12
2014-04-01t4212: loosen far-in-future test for AIXJeff King1-4/+2
2014-04-01date: recognize bogus FreeBSD gmtime outputJeff King4-0/+45
2014-04-01rev-parse: fix typo in example on manpageRené Scharfe1-1/+1
2014-04-01Revert "Merge branch 'wt/doc-submodule-name-path-confusion-2'"Junio C Hamano1-1/+1
2014-03-31Update draft release notes to 2.0Junio C Hamano1-0/+13
2014-03-31Merge branch 'mm/status-porcelain-format-i18n-fix'Junio C Hamano2-5/+9
2014-03-31Merge branch 'an/branch-config-message'Junio C Hamano1-23/+23
2014-03-31Merge branch 'jk/tests-cleanup'Junio C Hamano10-180/+87
2014-03-31Merge branch 'wt/doc-submodule-name-path-confusion-2'Junio C Hamano1-1/+1
2014-03-31Merge branch 'wt/doc-submodule-name-path-confusion-1'Junio C Hamano1-1/+1
2014-03-31Merge branch 'mr/msvc-link-with-lcurl'Junio C Hamano2-1/+2
2014-03-31Merge branch 'ib/rev-parse-parseopt-argh'Junio C Hamano3-39/+100
2014-03-31Merge branch 'dp/makefile-charset-lib-doc'Junio C Hamano1-2/+2
2014-03-31Merge branch 'js/userdiff-cc'Junio C Hamano33-160/+303
2014-03-31Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'Junio C Hamano1-1/+1
2014-03-31Merge branch 'ca/doc-config-third-party'Junio C Hamano1-2/+7
2014-03-31Merge branch 'hs/simplify-bit-setting-in-fsck-tree'Junio C Hamano1-12/+6
2014-03-31Merge branch 'dt/tests-with-env-not-subshell'Junio C Hamano12-152/+42
2014-03-31code and test: fix misuses of "nor"Justin Lebar12-16/+16
2014-03-31comments: fix misuses of "nor"Justin Lebar20-27/+26
2014-03-31contrib: fix misuses of "nor"Justin Lebar2-3/+3
2014-03-31Documentation: fix misuses of "nor"Justin Lebar25-44/+43
2014-03-31parse-options: remove unused OPT_SET_PTRMarat Radchenko5-19/+4
2014-03-31parse-options: add cast to correct pointer type to OPT_SET_PTRJunio C Hamano2-2/+2
2014-03-31MSVC: fix t0040-parse-options crashMarat Radchenko1-1/+1
2014-03-31tests: don't rely on strerror text when testing rmdir failureCharles Bailey2-4/+2
2014-03-31dir.c: make git_fnmatch() not inlineCharles Bailey1-3/+3
2014-03-31diff-no-index: correctly diagnose error return from diff_opt_parse()Junio C Hamano1-1/+1
2014-03-31environment.c: fix constness for odb_pack_keep()Nguyễn Thái Ngọc Duy2-2/+2
2014-03-31gc --aggressive: make --depth configurableNguyễn Thái Ngọc Duy3-1/+15
2014-03-28Update draft release notes to 2.0Junio C Hamano1-0/+27
2014-03-28Merge branch 'ys/fsck-commit-parsing'Junio C Hamano1-12/+14
2014-03-28Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano2-0/+21
2014-03-28Merge branch 'bp/commit-p-editor'Junio C Hamano10-39/+137
2014-03-28Merge branch 'ah/doc-gitk-config'Junio C Hamano1-2/+8
2014-03-28Merge branch 'fr/add-interactive-argv-array'Junio C Hamano1-11/+10
2014-03-28Merge branch 'jk/subtree-prefix'Junio C Hamano1-0/+1
2014-03-28Merge branch 'jk/pack-bitmap-progress'Junio C Hamano1-11/+19
2014-03-28Merge branch 'jk/pack-bitmap'Junio C Hamano2-2/+15
2014-03-28MSVC: link in invalidcontinue.obj for better POSIX compatibilityMarat Radchenko1-1/+1
2014-03-27doc: submodule.*.branch config is keyed by nameW. Trevor King1-1/+1
2014-03-27doc: submodule.* config are keyed by submodule namesW. Trevor King1-1/+1
2014-03-27MSVC: allow linking with the cURL libraryMarat Radchenko2-1/+2
2014-03-26fetch: handle overlaping refspecs on --pruneCarlos Martín Nieto2-7/+45
2014-03-26status: disable translation when --porcelain is usedMatthieu Moy2-5/+9
2014-03-25log: add --show-linear-break to help see non-linear historyNguyễn Thái Ngọc Duy5-5/+66
2014-03-25object.h: centralize object flag allocationNguyễn Thái Ngọc Duy11-7/+24
2014-03-25git-am.sh: use the $(...) construct for command substitutionElia Pinto1-15/+15
2014-03-25check-builtins.sh: use the $(...) construct for command substitutionElia Pinto1-2/+2
2014-03-25remote-hg: do not fail on invalid bookmarksMax Horn2-1/+77
2014-03-25Update draft release notes to 2.0Junio C Hamano1-0/+29
2014-03-25Merge branch 'ss/test-on-mingw-rsync-path-no-absolute'Junio C Hamano1-3/+3
2014-03-25Merge branch 'bb/diff-no-index-dotdot'Junio C Hamano1-4/+5
2014-03-25Merge branch 'us/printf-not-echo'Junio C Hamano2-3/+3
2014-03-25Merge branch 'rr/doc-merge-strategies'Junio C Hamano1-2/+2
2014-03-25Merge branch 'nd/index-pack-error-message'Junio C Hamano1-2/+2
2014-03-25Merge branch 'jk/lib-terminal-lazy'Junio C Hamano1-18/+19
2014-03-25Merge branch 'dm/configure-iconv-locale-charset'Junio C Hamano1-1/+1
2014-03-25Merge branch 'nd/commit-editor-cleanup'Junio C Hamano5-12/+48
2014-03-25Merge branch 'jk/warn-on-object-refname-ambiguity'Junio C Hamano2-6/+15
2014-03-25Merge branch 'mh/remove-subtree-long-pathname-fix'Junio C Hamano1-32/+32
2014-03-25Merge branch 'nd/indent-fix-connect-c'Junio C Hamano1-1/+1
2014-03-25Merge branch 'jk/mv-submodules-fix'Junio C Hamano2-1/+21
2014-03-25Merge branch 'cp/am-patch-format-doc'Junio C Hamano1-1/+7
2014-03-24pickaxe: simplify kwset loop in contains()René Scharfe1-5/+2
2014-03-24pickaxe: call strlen only when necessary in diffcore_pickaxe_count()René Scharfe1-2/+1
2014-03-24pickaxe: move pickaxe() after pickaxe_match()René Scharfe1-41/+38
2014-03-24pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diff...René Scharfe1-37/+7
2014-03-24pickaxe: honor -i when used with -S and --pickaxe-regexRené Scharfe2-1/+9
2014-03-24t4209: use helper functions to test --authorRené Scharfe1-9/+4
2014-03-24t4209: use helper functions to test --grepRené Scharfe1-14/+4
2014-03-24t4209: factor out helper function test_log_icase()René Scharfe1-12/+14
2014-03-24t4209: factor out helper function test_log()René Scharfe1-58/+42
2014-03-24branch.c: install_branch_config: simplify if chainAdam1-23/+23
2014-03-24t4209: set up expectations up frontRené Scharfe1-39/+25
2014-03-24parse-options: make sure argh string does not have SP or _Junio C Hamano1-0/+3
2014-03-24update-index: teach --cacheinfo a new syntax "mode,sha1,path"Junio C Hamano3-5/+50
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano13-24/+24
2014-03-23t1502: protect runs of SPs used in the indentationJunio C Hamano1-56/+56
2014-03-23rev-parse --parseopt: option argument name hintsIlya Bobyr3-3/+64
2014-03-23Makefile: describe CHARSET_LIB betterДилян Палаузов1-2/+2
2014-03-21userdiff: have 'cpp' hunk header pattern catch more C++ anchor pointsJohannes Sixt13-17/+3
2014-03-21t4018: test cases showing that the cpp pattern misses many anchor pointsJohannes Sixt12-0/+66
2014-03-21t4018: test cases for the built-in cpp patternJohannes Sixt9-0/+55
2014-03-21t4018: reduce test files for pattern compilation testsJohannes Sixt1-38/+14
2014-03-21t4018: convert custom pattern test to the new infrastructureJohannes Sixt4-24/+58
2014-03-21t4018: convert java pattern test to the new infrastructureJohannes Sixt2-4/+8
2014-03-21t4018: convert perl pattern tests to the new infrastructureJohannes Sixt6-88/+44
2014-03-21t4018: an infrastructure to test hunk headersJohannes Sixt2-6/+72
2014-03-21userdiff: support unsigned and long long suffixes of integer constantsJohannes Sixt1-1/+1