summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-04-29Git 2.8.2v2.8.2Junio C Hamano4-3/+19
2016-04-29Merge branch 'js/mingw-tests-2.8' into maintJunio C Hamano2-11/+3
2016-04-29Merge branch 'ep/trace-doc-sample-fix' into maintJunio C Hamano1-1/+1
2016-04-29Merge branch 'jc/makefile-redirection-stderr' into maintJunio C Hamano1-2/+2
2016-04-29Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maintJunio C Hamano1-2/+1
2016-04-29Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2-0/+15
2016-04-29Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2-1/+13
2016-04-29Merge branch 'sg/diff-multiple-identical-renames' into maintJunio C Hamano2-2/+15
2016-04-29Merge branch 'ss/msvc' into maintJunio C Hamano3-2/+6
2016-04-25Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-5/+5
2016-04-24Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maintJiang Xin1-5/+5
2016-04-14Prepare for 2.8.2Junio C Hamano1-0/+38
2016-04-14Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2-5/+15
2016-04-14Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2-1/+38
2016-04-14Merge branch 'jk/send-email-rtrim-mailrc-alias' into maintJunio C Hamano1-1/+1
2016-04-14Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2-4/+85
2016-04-14Merge branch 'jk/startup-info' into maintJunio C Hamano13-26/+54
2016-04-14Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2-1/+11
2016-04-14Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintJunio C Hamano1-1/+2
2016-04-14Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano3-3/+31
2016-04-14Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2-18/+77
2016-04-14Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano3-11/+16
2016-04-14Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano1-5/+0
2016-04-14Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano1-0/+1
2016-04-14Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano10-0/+0
2016-04-14Merge branch 'jk/credential-cache-comment-exit' into maintJunio C Hamano1-1/+10
2016-04-14Merge branch 'jc/index-pack' into maintJunio C Hamano2-18/+23
2016-04-14Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maintJunio C Hamano3-9/+9
2016-04-14Merge branch 'mp/upload-pack-use-embedded-args' into maintJunio C Hamano1-14/+11
2016-04-14Merge branch 'oa/doc-diff-check' into maintJunio C Hamano1-2/+2
2016-04-14Merge branch 'pb/opt-cmdmode-doc' into maintJunio C Hamano1-0/+7
2016-04-14Merge branch 'nd/apply-doc' into maintJunio C Hamano1-1/+3
2016-04-14Merge branch 'cc/doc-recommend-performance-trace-to-file' into maintJunio C Hamano1-0/+43
2016-04-14Merge branch 'mm/lockfile-error-message' into maintJunio C Hamano1-5/+7
2016-04-13Start preparing for 2.8.2Junio C Hamano1-0/+17
2016-04-05correct blame for files commited with CRLFTorsten Bögershausen2-0/+15
2016-04-05api-trace.txt: fix typoElia Pinto1-1/+1
2016-04-05Makefile: fix misdirected redirectionsJunio C Hamano1-2/+2
2016-04-04Windows: shorten code by re-using convert_slashes()Johannes Sixt2-11/+3
2016-04-03Git 2.8.1v2.8.1Junio C Hamano4-3/+13
2016-04-03Merge branch 'mm/readme-markdown' into maintJunio C Hamano1-1/+1
2016-04-03git.spec.in: use README.md, not READMEMatthieu Moy1-1/+1
2016-03-31git-send-pack: fix --all option when used with directoryStanislav Kolotinskiy2-1/+13
2016-03-30diffcore: fix iteration order of identical files during rename detectionSZEDER Gábor2-2/+15
2016-03-30MSVC: use shipped headers instead of fallback definitionsSven Strickroth2-1/+5
2016-03-30MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any moreSven Strickroth1-1/+1
2016-03-29Documentation: git diff --check detects conflict markersOri Avtalion1-2/+2
2016-03-28Git 2.8v2.8.0Junio C Hamano3-9/+14
2016-03-25api-parse-options.txt: document OPT_CMDMODE()Pranit Bauva1-0/+7
2016-03-25Merge pull request #9 from vascool/frJean-Noël Avila1-5/+5
2016-03-25l10n: fr: don't translate "merge" as a parameterVasco Almeida1-1/+1
2016-03-25l10n: fr: change "id de clé" to match "id-clé"Vasco Almeida1-1/+1
2016-03-25l10n: fr: fix wrongly translated option nameVasco Almeida1-2/+2
2016-03-25l10n: fr: fix transcation of "dir"Vasco Almeida1-1/+1
2016-03-24Merge branch 'ls/p4-doc-markup'Junio C Hamano1-6/+4
2016-03-24Merge branch 'js/mingw-tests-2.8'Junio C Hamano4-11/+19
2016-03-24Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2-3/+16
2016-03-24git-apply.txt: mention the behavior inside a subdirNguyễn Thái Ngọc Duy1-0/+2
2016-03-24git-apply.txt: remove a spaceNguyễn Thái Ngọc Duy1-1/+1
2016-03-23submodule-config: use hashmap_iter_first()Alexander Kuleshov1-2/+1
2016-03-23Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano3-3761/+11533
2016-03-23merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano2-5/+15
2016-03-23Documentation: fix git-p4 AsciiDoc formattingLars Schneider1-5/+3
2016-03-23mingw: skip some tests in t9115 due to file name issuesJohannes Schindelin1-2/+2
2016-03-23t1300: fix the new --show-origin tests on WindowsJohannes Schindelin1-3/+6
2016-03-23t1300-repo-config: make it resilient to being run via 'sh -x'Johannes Schindelin1-6/+2
2016-03-23config --show-origin: report paths with forward slashesJohannes Schindelin2-0/+9
2016-03-23Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-30/+125
2016-03-23Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin1-1365/+1581
2016-03-22submodule: fix regression for deinit without submodulesStefan Beller2-3/+16
2016-03-22l10n: pt_PT: Update and add new translationsVasco Almeida1-2366/+9827
2016-03-21l10n: ca.po: update translationAlex Henrie1-1365/+1581
2016-03-21commit: do not lose SQUASH_MSG contentsSven Strickroth2-1/+38
2016-03-21Git 2.8-rc4v2.8.0-rc4Junio C Hamano1-1/+1
2016-03-21Sync with maintJunio C Hamano2-3/+3
2016-03-21Merge branch 'mm/doc-hooks-linkgit-fix' into maintJunio C Hamano1-1/+1
2016-03-21Documentation: fix broken linkgit to git-configMatthieu Moy1-1/+1
2016-03-21Documentation: use ASCII quotation marks in git-p4Lars Schneider1-1/+1
2016-03-21Merge branch 'tb/avoid-gcc-on-darwin-10-6'Junio C Hamano1-3/+0
2016-03-21Revert "config.mak.uname: use clang for Mac OS X 10.6"Eric Sunshine1-3/+0
2016-03-21Merge branch 'es/st-add4-gcc-4.2-workaround' into maintJunio C Hamano1-2/+2
2016-03-21git-compat-util: st_add4: work around gcc 4.2.x compiler crashEric Sunshine1-2/+2
2016-03-20Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano6-82/+283
2016-03-20Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano4-804/+788
2016-03-21l10n: vi.po (2530t): Update translationTran Ngoc Quan1-30/+125
2016-03-20l10n: zh_CN: review for git v2.8.0 l10n round 2Ray Chen1-5/+5
2016-03-19gitk: Follow themed bgcolor in help dialogsGuillermo S. Romero1-4/+4
2016-03-19gitk: fr.po: Sync translations with gitJean-Noel Avila1-50/+46
2016-03-19gitk: Update French translation (311t)Jean-Noel Avila1-388/+373
2016-03-19gitk: Update German translationRalf Thielow1-46/+33
2016-03-19gitk: Update Bulgarian translation (311t)Alexander Shopov1-320/+336
2016-03-18t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envJeff King1-0/+1
2016-03-18credential-cache--daemon: clarify "exit" action semanticsJeff King1-1/+10
2016-03-18send-email: ignore trailing whitespace in mailrc alias fileJeff King1-1/+1
2016-03-18RelNotes: remove the mention of !reinclusionJunio C Hamano1-5/+0
2016-03-18Revert "Merge branch 'nd/exclusion-regression-fix'"Junio C Hamano7-378/+12
2016-03-18Revert "Merge branch 'jc/exclusion-doc'"Junio C Hamano1-37/+1
2016-03-17Sync with Git 2.7.4Junio C Hamano5-3/+50
2016-03-17Git 2.7.4v2.7.4Junio C Hamano3-2/+13
2016-03-17l10n: de.po: add missing newlinesRalf Thielow1-2/+3
2016-03-17Sync with Git 2.6.6Junio C Hamano4-3/+39
2016-03-17Git 2.6.6v2.6.6Junio C Hamano4-3/+15
2016-03-17Merge branch 'maint-2.5' into maint-2.6Junio C Hamano16-148/+110
2016-03-17Git 2.5.5v2.5.5Junio C Hamano4-3/+15
2016-03-17Merge branch 'maint-2.4' into maint-2.5Junio C Hamano15-147/+97
2016-03-17Git 2.4.11v2.4.11Junio C Hamano4-3/+15
2016-03-17Merge branch 'jk/path-name-safety-2.4' into maint-2.4Junio C Hamano13-146/+84
2016-03-17l10n: de.po: translate 22 new messagesRalf Thielow1-37/+136
2016-03-16Git 2.8-rc3v2.8.0-rc3Junio C Hamano2-1/+18
2016-03-16Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano2-6/+14
2016-03-16Sync with maintJunio C Hamano0-0/+0
2016-03-16Merge branch 'jc/sane-grep'Junio C Hamano5-4/+17
2016-03-16Merge branch 'cn/deprecate-ssh-git-url'Junio C Hamano3-5/+6
2016-03-16git-svn: fix URL canonicalization during init w/ SVN 1.7+Eric Wong2-7/+9
2016-03-16Merge branch 'jk/path-name-safety-2.7' into maintJunio C Hamano10-142/+46
2016-03-16t9117: test specifying full url to git svn init -TAdam Dinwoodie1-0/+6
2016-03-16Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7Junio C Hamano10-142/+46
2016-03-16Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6Junio C Hamano13-146/+84
2016-03-16Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5Junio C Hamano13-146/+84
2016-03-16list-objects: pass full pathname to callbacksJeff King9-58/+26
2016-03-16list-objects: drop name_path entirelyJeff King9-25/+19
2016-03-16list-objects: convert name_path to a strbufJeff King3-36/+15
2016-03-16show_object_with_name: simplify by using path_name()Jeff King1-34/+6
2016-03-16add helpers for detecting size_t overflowJeff King1-0/+34
2016-03-16http-push: stop using name_pathJeff King1-16/+7
2016-03-16tree-diff: catch integer overflow in combine_diff_path allocationJeff King2-4/+4
2016-03-16clone tests: rename t57* => t56*Stefan Beller10-0/+0
2016-03-17Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/gitJiang Xin1-5/+7
2016-03-17Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin1-3/+7
2016-03-17Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-31/+122
2016-03-16l10n: ko.po: Update Korean translationChangwoo Ryu1-3/+7
2016-03-15l10n: fr.po v2.8.0 round 3Jean-Noel Avila1-5/+7
2016-03-15l10n: sv.po: Update Swedish translation (2530t0f0u)Peter Krefting1-31/+122
2016-03-15l10n: ru.po: update Russian translationDimitriy Ryazantcev1-2/+6
2016-03-15RelNotes for 2.8.0: typofixJunio C Hamano1-14/+10
2016-03-15Merge branch 'svn-glob' of git://bogomips.org/git-svnJunio C Hamano5-13/+258
2016-03-15Merge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano9-11003/+12830
2016-03-16l10n: zh_CN: for git v2.8.0 l10n round 3Jiang Xin1-2/+6
2016-03-16l10n: git.pot: Add one new message for Git 2.8.0Jiang Xin1-1/+5
2016-03-16Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin9-11003/+12822
2016-03-16l10n: zh_CN: for git v2.8.0 l10n round 2Jiang Xin1-20/+121
2016-03-15git-svn: shorten glob error messageEric Wong4-11/+18
2016-03-15git-svn: loosen config globs limitationsVictor Leschuk3-5/+243
2016-03-14l10n: fr.po v2.8.0 round 2Jean-Noel Avila1-31/+134
2016-03-14Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano1-2/+2
2016-03-14wt-status: allow "ahead " to be picked up by l10nMichael J Gruber1-2/+2
2016-03-13Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-24/+121
2016-03-13l10n: ru.po: update Russian translationDimitriy Ryazantcev1-24/+121
2016-03-13l10n: ko: Update Korean translationChangwoo Ryu1-17/+118
2016-03-12l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)Jiang Xin1-14/+111
2016-03-12Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin9-10936/+12256
2016-03-12l10n: zh_CN: for git v2.8.0 l10n round 1Jiang Xin1-1353/+1527
2016-03-11t/t7502 : drop duplicate testPranit Bauva1-5/+0
2016-03-10rebase-i: clarify "is this commit relevant?" testJunio C Hamano1-1/+2
2016-03-10sane_grep: pass "-a" if grep accepts itJunio C Hamano4-3/+15
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar2-1/+35
2016-03-10mergetool: support delete/delete conflictsDavid Aguilar2-3/+50
2016-03-10Git 2.8-rc2v2.8.0-rc2Junio C Hamano2-5/+6
2016-03-10Sync with 2.7.3Junio C Hamano2-1/+64
2016-03-10Git 2.7.3v2.7.3Junio C Hamano4-3/+66
2016-03-10Merge branch 'ma/update-hooks-sample-typofix' into maintJunio C Hamano1-1/+1
2016-03-10Merge branch 'dt/initial-ref-xn-commit-doc' into maintJunio C Hamano1-0/+12
2016-03-10Merge branch 'ps/plug-xdl-merge-leak' into maintJunio C Hamano1-2/+7
2016-03-10Merge branch 'ak/git-strip-extension-from-dashed-command' into maintJunio C Hamano2-15/+15
2016-03-10Merge branch 'ak/extract-argv0-last-dir-sep' into maintJunio C Hamano1-4/+2
2016-03-10Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano4-0/+207
2016-03-10Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2-0/+14
2016-03-10Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2-8/+27
2016-03-10Merge branch 'jk/grep-binary-workaround-in-test' into maintJunio C Hamano2-13/+17
2016-03-10Merge branch 'mm/push-simple-doc' into maintJunio C Hamano1-0/+7
2016-03-10Merge branch 'jk/tighten-alloc' into maintJunio C Hamano91-482/+441
2016-03-10Merge branch 'jk/more-comments-on-textconv' into maintJunio C Hamano3-1/+24
2016-03-10Merge branch 'jk/no-diff-emit-common' into maintJunio C Hamano4-57/+3
2016-03-10Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano3-9/+15
2016-03-10Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2-1/+12
2016-03-10Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano5-33/+54
2016-03-10Merge branch 'jk/epipe-in-async' into maintJunio C Hamano6-3/+25
2016-03-10Merge branch 'ps/config-error' into maintJunio C Hamano13-105/+159
2016-03-10Merge branch 'mg/work-tree-tests' into maintJunio C Hamano3-0/+0
2016-03-10Merge branch 'sp/remote-curl-ssl-strerror' into maintJunio C Hamano1-2/+14
2016-03-10Merge branch 'jx/http-no-proxy'Junio C Hamano1-0/+6
2016-03-10Merge branch 'jc/exclusion-doc'Junio C Hamano1-1/+37
2016-03-10Merge branch 'js/close-packs-before-gc'Junio C Hamano1-4/+6
2016-03-10Merge branch 'sb/rebase-summary'Junio C Hamano1-1/+1
2016-03-09Disown ssh+git and git+sshCarlos Martín Nieto3-5/+6
2016-03-08gitignore: document that unignoring a directory unignores everything in itJunio C Hamano1-1/+37
2016-03-07use setup_git_directory() in test-* programsJeff King2-0/+4
2016-03-07grep: turn off gitlink detection for --no-indexJeff King2-2/+31
2016-03-07Documentation: talk about pager in api-trace.txtChristian Couder1-0/+43
2016-03-06mailmap: do not resolve blobs in a non-repositoryJeff King1-1/+2
2016-03-06remote: don't resolve HEAD in non-repositoryJeff King1-5/+6
2016-03-06setup: set startup_info->have_repository more reliablyJeff King2-1/+4
2016-03-06setup: make startup_info available everywhereJeff King6-17/+7
2016-03-05strbuf_getwholeline: NUL-terminate getdelim buffer on errorJeff King2-1/+11
2016-03-05fetch-pack: update the documentation for "<refs>..." argumentsGabriel Souza Franco1-0/+4
2016-03-05l10n: de.po: translate 48 new messagesRalf Thielow1-1360/+1545
2016-03-05l10n: de.po: translate "command" as "Befehl"Ralf Thielow1-40/+40
2016-03-05l10n: de.po: fix interactive rebase messageRalf Thielow1-2/+2
2016-03-05l10n: de.po: add space to abbreviation "z. B."Ralf Thielow1-3/+3
2016-03-05l10n: de.po: fix typoChristoph Hoopmann1-1/+1