summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-09-28Git 2.6v2.6.0Junio C Hamano2-1/+6
2015-09-21Git 2.6-rc3v2.6.0-rc3Junio C Hamano1-1/+1
2015-09-21Merge branch 'rj/mailmap-ramsay'Junio C Hamano1-1/+1
2015-09-21Merge branch 'bn/send-email-smtp-auth-error-message-fix'Junio C Hamano1-1/+1
2015-09-21Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-poJunio C Hamano8-11681/+14967
2015-09-21send-email: fix uninitialized var warning for $smtp_authBrian Norris1-1/+1
2015-09-20l10n: de.po: better language for one stringPhillip Sz1-1/+1
2015-09-20l10n: de.po: translate 2 messagesRalf Thielow1-101/+108
2015-09-21l10n: Update and review Vietnamese translation (2440t)Tran Ngoc Quan1-91/+90
2015-09-21l10n: fr.po v2.6.0 round 2 (2440t)Jean-Noel Avila1-112/+148
2015-09-21l10n: zh_CN: for git v2.6.0 l10n round 2Jiang Xin1-78/+77
2015-09-21l10n: ca.po: update translationAlex Henrie1-1760/+2159
2015-09-21l10n: git.pot: v2.6.0 round 2 (3 improvements)Jiang Xin1-76/+72
2015-09-21Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin7-9913/+12763
2015-09-21l10n: de.po: translate 123 new messagesRalf Thielow1-1640/+2125
2015-09-21l10n: fr.po v2.6.0 round 1 (2441t)Jean-Noel Avila1-1638/+2086
2015-09-17Update RelNotes to 2.6Junio C Hamano1-0/+5
2015-09-17Sync with 2.5.3Junio C Hamano2-1/+19
2015-09-17Merge branch 'po/doc-branch-desc'Junio C Hamano4-4/+7
2015-09-17Merge branch 'et/win32-poll-timeout'Junio C Hamano1-2/+14
2015-09-17Merge branch 'as/config-doc-markup-fix'Junio C Hamano1-6/+6
2015-09-17Git 2.5.3v2.5.3Junio C Hamano4-3/+21
2015-09-17Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2-32/+282
2015-09-17Merge branch 'br/svn-doc-include-paths-config' into maintJunio C Hamano1-0/+3
2015-09-17Merge branch 'ah/submodule-typofix-in-error' into maintJunio C Hamano1-1/+1
2015-09-17Merge branch 'js/maint-am-skip-performance-regression' into maintJunio C Hamano1-1/+1
2015-09-16mailmap: update my entry with new email addressRamsay Jones1-1/+1
2015-09-14Update RelNotes to 2.6 to describe leftover bits since -rc2Junio C Hamano1-1/+7
2015-09-14Merge branch 'js/maint-am-skip-performance-regression'Junio C Hamano1-1/+1
2015-09-14Merge branch 'ah/show-ref-usage-string'Junio C Hamano1-1/+1
2015-09-14Merge branch 'sg/help-group'Junio C Hamano1-1/+1
2015-09-14Merge branch 'rt/help-strings-fix'Junio C Hamano3-3/+3
2015-09-14Git 2.6-rc2v2.6.0-rc2Junio C Hamano2-1/+9
2015-09-14poll: honor the timeout on Win32Edward Thomson1-2/+14
2015-09-14doc: show usage of branch descriptionPhilip Oakley4-4/+7
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-12Documentation/config: fix formatting for branch.*.rebase and pull.rebaseAndreas Schwab1-6/+6
2015-09-11tag, update-ref: improve description of option "create-reflog"Ralf Thielow2-2/+2
2015-09-11pull: don't mark values for option "rebase" for translationRalf Thielow1-1/+1
2015-09-10Makefile: use SHELL_PATH when running generate-cmdlist.shAlejandro R. Sedeño1-1/+1
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-10Merge branch 'master' of github.com:jiangxin/gitJiang Xin2-1814/+2390
2015-09-09Sync with 2.5.2Junio C Hamano9-28/+125
2015-09-09am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexJohannes Schindelin1-1/+1
2015-09-09l10n: sv.po: Update Swedish translation (2441t0f0u)Peter Krefting1-1621/+2102
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-08l10n: zh_CN: for git v2.6.0 l10n round 1Jiang Xin1-1607/+2067
2015-09-06am: match --signoff to the original scripted versionJunio C Hamano2-2/+77
2015-09-07l10n: Updated Vietnamese translation (2441t)Tran Ngoc Quan1-1634/+2107
2015-09-05Merge branch 'master' of github.com:jiangxin/git into masterJiang Xin2-214/+330
2015-09-05l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)Jiang Xin1-1566/+1953
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-31show-ref: place angle brackets around variables in usage stringAlex Henrie1-1/+1
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-25l10n: zh_CN: Update Git Glossary: "commit message"Ray Chen1-0/+1
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-23l10n: zh_CN: Update Git Glossary: pickaxeRay Chen1-1/+1
2015-08-23l10n: zh_CN: Update Git Glossary: forkRay Chen1-2/+2
2015-08-23l10n: zh_CN: Update Git Glossary: tagRay Chen1-1/+1
2015-08-23l10n: zh_CN: Update Git Glossary: "dumb", "smart"Ray Chen1-2/+2
2015-08-23l10n: zh_CN: Update Git Glossary: SHA-1Ray Chen1-1/+1
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