summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-09-14Git 2.6-rc2v2.6.0-rc2Junio C Hamano2-1/+9
2015-09-14Merge git://ozlabs.org/~paulus/gitkJunio C Hamano13-3515/+3749
2015-09-14Merge branch 'jk/pack-protocol-doc'Junio C Hamano2-21/+30
2015-09-14Merge branch 'mp/t7060-diff-index-test'Junio C Hamano1-1/+1
2015-09-14Merge branch 'gb/apply-comment-typofix'Junio C Hamano1-1/+1
2015-09-13gitk: Accelerators for the main menuGiuseppe Bilotta1-23/+23
2015-09-13gitk: Adjust the menu line numbers to compensate for the new entryBeat Bolli1-3/+3
2015-09-10Merge git://bogomips.org/git-svnJunio C Hamano1-1/+1
2015-09-10git-svn: parse authors file more lenientlyMichael J Gruber1-1/+1
2015-09-09Sync with 2.5.2Junio C Hamano9-28/+125
2015-09-09Release Notes: typofixJunio C Hamano1-1/+1
2015-09-09apply: comment grammar fixGiuseppe Bilotta1-1/+1
2015-09-08Git 2.6-rc1v2.6.0-rc1Junio C Hamano1-1/+1
2015-09-08Merge branch 'jc/builtin-am-signoff-regression-fix'Junio C Hamano2-2/+77
2015-09-06am: match --signoff to the original scripted versionJunio C Hamano2-2/+77
2015-09-04Sync with maintJunio C Hamano0-0/+0
2015-09-04Git 2.5.2v2.5.2Junio C Hamano4-3/+67
2015-09-04Sync with 2.4.9Junio C Hamano8-27/+60
2015-09-04Git 2.4.9v2.4.9Junio C Hamano4-3/+13
2015-09-04Sync with 2.3.9Junio C Hamano7-26/+49
2015-09-04Git 2.3.9v2.3.9Junio C Hamano4-3/+13
2015-09-04Sync with 2.2.3Junio C Hamano6-25/+38
2015-09-04Git 2.2.3v2.2.3Junio C Hamano4-3/+13
2015-09-04Merge branch 'jk/long-paths' into maint-2.2Junio C Hamano4-24/+27
2015-09-04show-branch: use a strbuf for reflog descriptionsJeff King1-2/+4
2015-09-04read_info_alternates: handle paths larger than PATH_MAXJeff King1-6/+3
2015-09-04notes: use a strbuf in add_non_noteJeff King1-9/+10
2015-09-04verify_absent: allow filenames longer than PATH_MAXJeff King1-7/+10
2015-09-03Merge branch 'ee/clean-test-fixes' into maintJunio C Hamano1-12/+4
2015-09-03Merge branch 'jk/log-missing-default-HEAD' into maintJunio C Hamano2-1/+30
2015-09-03Merge branch 'cc/trailers-corner-case-fix' into maintJunio C Hamano2-3/+39
2015-09-03Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano3-5/+15
2015-09-03Merge branch 'rs/archive-zip-many' into maintJunio C Hamano2-5/+134
2015-09-03Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2-2/+2
2015-09-03Merge branch 'ss/fix-config-fd-leak' into maintJunio C Hamano1-1/+4
2015-09-03Merge branch 'sg/wt-status-header-inclusion' into maintJunio C Hamano2-1/+1
2015-09-03Merge branch 'po/po-readme' into maintJunio C Hamano1-0/+19
2015-09-03Merge branch 'sg/t3020-typofix' into maintJunio C Hamano1-1/+1
2015-09-03Merge branch 'as/docfix-reflog-expire-unreachable' into maintJunio C Hamano1-1/+1
2015-09-03Merge branch 'nd/fixup-linked-gitdir' into maintJunio C Hamano1-2/+2
2015-09-03Merge branch 'jk/rev-list-has-no-notes' into maintJunio C Hamano4-0/+9
2015-09-03Merge branch 'jk/fix-alias-pager-config-key-warnings' into maintJunio C Hamano5-12/+43
2015-09-03Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano1-1/+1
2015-09-03Merge branch 'sg/help-group' into maintJunio C Hamano3-52/+52
2015-09-03Merge branch 'ps/t1509-chroot-test-fixup' into maintJunio C Hamano1-4/+4
2015-09-03Merge branch 'jh/strbuf-read-use-read-in-full' into maintJunio C Hamano1-5/+5
2015-09-03Merge branch 'jk/long-error-messages' into maintJunio C Hamano3-29/+21
2015-09-03Merge branch 'cb/open-noatime-clear-errno' into maintJunio C Hamano1-1/+4
2015-09-03Merge branch 'mh/get-remote-group-fix' into maintJunio C Hamano1-8/+6
2015-09-03pack-protocol: clarify LF-handling in PKT-LINE()Jeff King2-21/+30
2015-09-03Merge branch 'jk/am-rerere-lock-fix'Junio C Hamano5-16/+61
2015-09-02Git 2.6-rc0v2.6.0-rc0Junio C Hamano2-4/+13
2015-09-02Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2-4/+25
2015-09-02Merge branch 'sb/read-cache-one-indent-style-fix'Junio C Hamano1-1/+1
2015-09-02Merge branch 'ee/clean-test-fixes'Junio C Hamano1-12/+4
2015-09-02Merge branch 'jk/log-missing-default-HEAD'Junio C Hamano2-1/+30
2015-09-02t7060: actually test "git diff-index --cached -M"Matthieu Prat1-1/+1
2015-09-01Ninth batch for 2.6Junio C Hamano1-0/+22
2015-09-01Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano3-5/+15
2015-09-01Merge branch 'rt/remove-hold-lockfile-for-append'Junio C Hamano2-57/+7
2015-09-01Merge branch 'rs/archive-zip-many'Junio C Hamano2-5/+134
2015-09-01Merge branch 'ls/p4-fold-case-client-specs'Junio C Hamano2-0/+207
2015-09-01Merge branch 'ah/submodule-typofix-in-error'Junio C Hamano1-1/+1
2015-09-01Merge branch 'ah/reflog-typofix-in-error'Junio C Hamano1-1/+1
2015-09-01Merge branch 'ah/read-tree-usage-string'Junio C Hamano1-1/+1
2015-09-01Merge branch 'ah/pack-objects-usage-strings'Junio C Hamano1-2/+2
2015-09-01Merge branch 'br/svn-doc-include-paths-config'Junio C Hamano1-0/+3
2015-09-01Merge branch 'nd/fixup-linked-gitdir'Junio C Hamano1-2/+2
2015-09-01rerere: release lockfile in non-writing functionsJeff King5-16/+61
2015-08-31Eighth batch for 2.6Junio C Hamano1-0/+39
2015-08-31Merge branch 'sg/describe-contains'Junio C Hamano3-6/+14
2015-08-31Merge branch 'db/push-sign-if-asked'Junio C Hamano14-152/+253
2015-08-31Merge branch 'jk/notes-merge-config'Junio C Hamano8-25/+187
2015-08-31Merge branch 'jc/am-state-fix'Junio C Hamano10-44/+80
2015-08-31Merge branch 'jc/log-p-cc'Junio C Hamano1-9/+16
2015-08-31Merge branch 'jk/fix-alias-pager-config-key-warnings'Junio C Hamano5-12/+43
2015-08-31Merge branch 'jk/rev-list-has-no-notes'Junio C Hamano4-0/+9
2015-08-31Merge branch 'hv/submodule-config'Junio C Hamano12-98/+836
2015-08-31Merge branch 'sg/config-name-only'Junio C Hamano4-60/+74
2015-08-31read-cache: fix indentation in read_index_fromStefan Beller1-1/+1
2015-08-31trailer: support multiline titleChristian Couder2-4/+25
2015-08-31t7300: fix broken && chainsErik Elfström1-12/+4
2015-08-31log: diagnose empty HEAD more clearlyJeff King2-1/+30
2015-08-31commit: don't rewrite shared index unnecessarilyDavid Turner3-5/+15
2015-08-28Sync with 2.5.1Junio C Hamano3-2/+19
2015-08-28Seventh batch for 2.6Junio C Hamano1-0/+8
2015-08-28Merge branch 'cc/trailers-corner-case-fix'Junio C Hamano2-2/+17
2015-08-28Merge branch 'dt/untracked-subdir'Junio C Hamano2-20/+162
2015-08-28read-tree: replace bracket set with parentheses to clarify usageAlex Henrie1-1/+1
2015-08-28pack-objects: place angle brackets around placeholders in usage stringsAlex Henrie1-2/+2
2015-08-28git-submodule: remove extraneous space from error messageAlex Henrie1-1/+1
2015-08-28lockfile: remove function "hold_lock_file_for_append"Ralf Thielow2-57/+7
2015-08-28Git 2.5.1v2.5.1Junio C Hamano3-2/+19
2015-08-28Mingw: verify both ends of the pipe () callJose F. Morales1-1/+1
2015-08-28git-p4: honor core.ignorecase when using P4 client specsLars Schneider2-0/+207
2015-08-28reflog: add missing single quote to error messageAlex Henrie1-1/+1
2015-08-28archive-zip: support more than 65535 entriesRené Scharfe2-4/+91
2015-08-28archive-zip: use a local variable to store the creator versionRené Scharfe1-2/+4
2015-08-28t5004: test ZIP archives with many entriesRené Scharfe1-0/+40
2015-08-26Sixth batch for 2.6Junio C Hamano1-0/+17
2015-08-26Merge branch 'sg/help-group'Junio C Hamano3-52/+52
2015-08-26Merge branch 'sg/wt-status-header-inclusion'Junio C Hamano2-1/+1
2015-08-26Merge branch 'as/docfix-reflog-expire-unreachable'Junio C Hamano1-1/+1
2015-08-26Merge branch 'sg/t3020-typofix'Junio C Hamano1-1/+1
2015-08-26Merge branch 'jc/calloc-pathspec'Junio C Hamano2-2/+2
2015-08-26Merge branch 'dt/untracked-sparse'Junio C Hamano1-1/+1
2015-08-26Merge branch 'pt/am-builtin'Junio C Hamano1-1/+1
2015-08-26Merge branch 'pt/am-builtin-abort-fix'Junio C Hamano2-13/+60
2015-08-26Merge branch 'po/po-readme'Junio C Hamano1-0/+19
2015-08-26Merge branch 'jv/send-email-selective-smtp-auth'Junio C Hamano2-1/+38
2015-08-26Merge branch 'ep/http-configure-ssl-version'Junio C Hamano3-1/+56
2015-08-26Merge branch 'ss/fix-config-fd-leak'Junio C Hamano1-1/+4
2015-08-26i18n: am: fix typo in description of -b optionJiang Xin1-1/+1
2015-08-26trailer: retitle a test and correct an in-comment messageChristian Couder2-2/+3
2015-08-26git-svn doc: mention "svn-remote.<name>.include-paths"Brett Randall1-0/+3
2015-08-25Sync with maintJunio C Hamano1-1/+1
2015-08-25Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2-1/+108
2015-08-25Merge branch 'jk/test-with-x' into maintJunio C Hamano1-2/+11
2015-08-25Merge branch 'sb/check-return-from-read-ref' into maintJunio C Hamano1-2/+6
2015-08-25Merge branch 'mm/pull-upload-pack' into maintJunio C Hamano1-1/+1
2015-08-25pull: pass upload_pack only when it was givenJunio C Hamano1-1/+1
2015-08-25Fifth batch for 2.6Junio C Hamano1-0/+33
2015-08-25Merge branch 'cb/open-noatime-clear-errno'Junio C Hamano1-1/+4
2015-08-25Merge branch 'mh/tempfile'Junio C Hamano18-630/+969
2015-08-25Merge branch 'pt/am-builtin-options'Junio C Hamano3-10/+166
2015-08-25Merge branch 'dt/refs-pseudo'Junio C Hamano5-56/+163
2015-08-25Merge branch 'dt/notes-multiple'Junio C Hamano4-12/+120
2015-08-25Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano1-1/+1
2015-08-25Merge branch 'jk/long-error-messages'Junio C Hamano3-29/+21
2015-08-25Merge branch 'ee/clean-remove-dirs'Junio C Hamano1-1/+1
2015-08-25Merge branch 'jh/strbuf-read-use-read-in-full'Junio C Hamano1-5/+5
2015-08-25builtin/log.c: minor reformatJunio C Hamano1-4/+2
2015-08-25write_file(): drop caller-supplied LF from calls to create a one-liner fileJunio C Hamano6-10/+10
2015-08-25write_file_v(): do not leave incomplete line at the endJunio C Hamano2-8/+3
2015-08-25generate-cmdlist: re-implement as shell scriptEric Sunshine3-52/+52
2015-08-25setup: update the right file in multiple checkoutsNguyễn Thái Ngọc Duy1-2/+2
2015-08-25describe --contains: default to HEAD when no commit-ish is givenSZEDER Gábor3-6/+14
2015-08-24write_file(): drop "fatal" parameterJunio C Hamano10-19/+40
2015-08-24builtin/am: make sure state files are textJunio C Hamano1-2/+8
2015-08-24builtin/am: introduce write_state_*() helper functionsJunio C Hamano1-27/+41
2015-08-24rev-list: make it obvious that we do not support notesJeff King4-0/+9
2015-08-24config: silence warnings for command names with invalid keysJeff King5-12/+43
2015-08-21wt-status: move #include "pathspec.h" to the headerSZEDER Gábor2-1/+1
2015-08-21trailer: ignore first line of messageChristian Couder2-2/+16
2015-08-21Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachableAndreas Schwab1-1/+1
2015-08-20log: show merge commit when --cc is givenJunio C Hamano1-0/+4
2015-08-20log: when --cc is given, default to -p unless told otherwiseJunio C Hamano1-0/+4
2015-08-20log: rename "tweak" helpersJunio C Hamano1-5/+6
2015-08-20get_urlmatch: avoid useless strbuf writeJeff King1-4/+1
2015-08-20format_config: simplify buffer handlingJeff King1-22/+16
2015-08-20format_config: don't init strbufJeff King1-2/+1
2015-08-20config: restructure format_config() for better control flowSZEDER Gábor1-41/+37
2015-08-20t3020: fix typo in test descriptionSZEDER Gábor1-1/+1
2015-08-20ps_matched: xcalloc() takes nmemb and then element sizeJunio C Hamano2-2/+2
2015-08-19Sync with maintJunio C Hamano1-0/+49
2015-08-19Fourth batch for 2.6Junio C Hamano1-1/+34
2015-08-19Merge branch 'tb/complete-rebase-i-edit-todo'Junio C Hamano1-1/+4
2015-08-19Merge branch 'jk/git-path'Junio C Hamano30-363/+465
2015-08-19Merge branch 'jc/finalize-temp-file'Junio C Hamano5-15/+12
2015-08-19Merge branch 'ps/guess-repo-name-at-root'Junio C Hamano2-19/+61
2015-08-19Merge branch 'jk/guess-repo-name-regression-fix'Junio C Hamano2-1/+108
2015-08-19Merge branch 'jk/negative-hiderefs'Junio C Hamano3-22/+56
2015-08-19Merge branch 'jk/test-with-x'Junio C Hamano1-2/+11
2015-08-19Merge branch 'ps/t1509-chroot-test-fixup'Junio C Hamano1-4/+4
2015-08-19Merge branch 'sb/check-return-from-read-ref'Junio C Hamano1-2/+6
2015-08-19Merge branch 'mm/pull-upload-pack'Junio C Hamano1-1/+1
2015-08-19Start preparing for 2.5.1Junio C Hamano2-1/+50
2015-08-19Merge branch 'ta/docfix-index-format-tech' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'sb/parse-options-codeformat' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano1-2/+0
2015-08-19Merge branch 'kn/tag-doc-fix' into maintJunio C Hamano1-1/+0
2015-08-19Merge branch 'es/doc-clean-outdated-tools' into maintJunio C Hamano2-117/+9
2015-08-19Merge branch 'nd/export-worktree' into maintJunio C Hamano2-0/+19
2015-08-19Merge branch 'mh/fast-import-optimize-current-from' into maintJunio C Hamano1-12/+17
2015-08-19Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano3-68/+92
2015-08-19Merge branch 'se/doc-checkout-ours-theirs' into maintJunio C Hamano1-0/+15
2015-08-19Merge branch 'cb/uname-in-untracked' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2-0/+56
2015-08-19Merge branch 'db/send-pack-user-signingkey' into maintJunio C Hamano1-0/+3
2015-08-19Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'da/subtree-date-confusion' into maintJunio C Hamano2-1/+5
2015-08-19push: add a config option push.gpgSign for default signed pushesDave Borowitz3-15/+70
2015-08-19push: support signing pushes iff the server supports itDave Borowitz10-49/+128
2015-08-19builtin/send-pack.c: use parse_options APIDave Borowitz1-104/+59
2015-08-19config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_...Dave Borowitz2-3/+4
2015-08-19transport: remove git_transport_options.push_certDave Borowitz2-4/+0
2015-08-19gitremote-helpers.txt: document pushcert optionDave Borowitz1-0/+3
2015-08-19Documentation/git-send-pack.txt: document --signedDave Borowitz1-1/+9
2015-08-19Documentation/git-send-pack.txt: wrap long synopsis lineDave Borowitz1-1/+3
2015-08-19Documentation/git-push.txt: document when --signed may failDave Borowitz1-1/+3
2015-08-19submodule: allow erroneous values for the fetchRecurseSubmodules optionHeiko Voigt6-17/+66
2015-08-19submodule: use new config API for worktree configurationsHeiko Voigt9-138/+104
2015-08-19submodule: extract functions for config set and lookupHeiko Voigt1-45/+97
2015-08-19submodule: implement a config API for lookup of .gitmodules valuesHeiko Voigt9-0/+671
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexPaul Tan2-13/+60
2015-08-19untracked cache: fix entry invalidationNguyễn Thái Ngọc Duy2-13/+83
2015-08-19untracked-cache: fix subdirectory handlingDavid Turner2-7/+79
2015-08-19t7063: use --force-untracked-cache to speed up a bitNguyễn Thái Ngọc Duy1-1/+1
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller4-1/+64
2015-08-17notes: add notes.mergeStrategy option to select default strategyJacob Keller4-3/+76