summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-05-18Git 2.8.3v2.8.3Junio C Hamano4-5/+37
2016-05-18Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano6-21/+29
2016-05-18Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano4-9/+23
2016-05-18Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano1-1/+1
2016-05-18Merge branch 'rn/glossary-typofix' into HEADJunio C Hamano1-1/+1
2016-05-18Merge branch 'ew/normal-to-e' into HEADJunio C Hamano1-0/+1
2016-05-18Merge branch 'sb/config-exit-status-list' into HEADJunio C Hamano1-3/+3
2016-05-18Merge branch 'rt/string-list-lookup-cleanup' into HEADJunio C Hamano1-4/+4
2016-05-18Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano1-1/+1
2016-05-18Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano1-5/+5
2016-05-18Merge branch 'nd/remove-unused' into HEADJunio C Hamano4-27/+0
2016-05-18Merge branch 'sk/gitweb-highlight-encoding' into HEADJunio C Hamano1-0/+3
2016-05-18Merge branch 'ls/travis-submitting-patches' into HEADJunio C Hamano1-17/+63
2016-05-18Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano1-0/+1
2016-05-18Merge branch 'ls/p4-lfs' into HEADJunio C Hamano3-10/+24
2016-05-18Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano1-1/+1
2016-05-18Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano4-5/+5
2016-05-18Merge branch 'jd/send-email-to-whom' into HEADJunio C Hamano1-2/+3
2016-05-18Merge branch 'js/win32-mmap' into HEADJunio C Hamano1-13/+18
2016-05-18Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano7-11/+29
2016-05-18Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2-9/+28
2016-05-18Merge branch 'da/user-useconfigonly' into HEADJunio C Hamano1-6/+10
2016-05-18Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2-6/+7
2016-05-11Windows: only add a no-op pthread_sigmask() when neededJohannes Schindelin1-0/+2
2016-05-06Almost ready for 2.8.3Junio C Hamano1-0/+9
2016-05-06Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano3-11/+133
2016-05-06Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano5-28/+21
2016-05-06Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano1-0/+1
2016-05-06Merge branch 'cc/apply' into maintJunio C Hamano1-15/+15
2016-05-06Merge branch 'kn/for-each-tag-branch' into maintJunio C Hamano1-1/+1
2016-05-03git-multimail: update to release 1.3.0Matthieu Moy8-143/+476
2016-05-03t7300: mark test with SANITYStefan Beller1-1/+1
2016-05-03gitweb: apply fallback encoding before highlightShin Kojima1-0/+3
2016-05-02Start preparing for 2.8.3Junio C Hamano1-0/+61
2016-05-02Merge branch 'jk/use-write-script-more' into maintJunio C Hamano3-18/+20
2016-05-02Merge branch 'jc/xstrfmt-null-with-prec-0' into maintJunio C Hamano1-1/+1
2016-05-02Merge branch 'ew/send-email-drop-data-dumper' into maintJunio C Hamano1-1/+0
2016-05-02Merge branch 'ad/cygwin-wants-rename' into maintJunio C Hamano1-0/+1
2016-05-02Merge branch 'jk/do-not-printf-NULL' into maintJunio C Hamano1-7/+11
2016-05-02Merge branch 'jc/http-socks5h' into maintJunio C Hamano1-1/+4
2016-05-02Merge branch 'ky/imap-send' into maintJunio C Hamano1-6/+6
2016-05-02Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2-3/+23
2016-05-02Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2-23/+59
2016-05-02Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2-7/+24
2016-05-02Merge branch 'es/format-patch-doc-hide-no-patch' into maintJunio C Hamano1-1/+1
2016-05-02Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano6-3/+98
2016-05-02Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2-8/+20
2016-05-02Merge branch 'jk/check-repository-format' into maintJunio C Hamano7-114/+167
2016-05-02Merge branch 'ew/send-email-readable-message-id' into maintJunio C Hamano1-2/+3
2016-05-02.mailmap: update to my shorter email addressEric Wong1-0/+1
2016-05-02Documentation: fix typo 'In such these cases'René Nyffenegger1-1/+1
2016-05-02Documentation: add setup instructions for Travis CILars Schneider1-17/+63
2016-05-02t5510: run auto-gc in the foregroundSZEDER Gábor1-0/+1
2016-05-02Windows: add pthread_sigmask() that does nothingJohannes Sixt2-0/+6
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-29t9824: fix wrong reference valueLars Schneider1-1/+1
2016-04-28git-p4: fix Git LFS pointer parsingLars Schneider2-3/+14
2016-04-28travis-ci: express Linux/OS X dependency versions more clearlyLars Schneider1-7/+10
2016-04-28pack-objects: warn on split packs disabling bitmapsEric Wong4-9/+23
2016-04-28submodule-config: don't shadow `cache`Stefan Beller1-6/+6
2016-04-28config.c: drop local variableStefan Beller1-4/+1
2016-04-26config doc: improve exit code listingStefan Beller1-3/+3
2016-04-26git-p4 tests: time_in_seconds should use $PYTHON_PATHLuke Diamand1-1/+1
2016-04-26git-p4 tests: work with python3 as well as python2Luke Diamand2-5/+6
2016-04-26git-p4 tests: cd to / before running pythonLuke Diamand1-1/+1
2016-04-25remote.c: spell __attribute__ correctlyJeff King1-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró4-5/+5
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-25send-email: fix grammo in the prompt that asks e-mail recipientsJunio C Hamano1-2/+3
2016-04-25string_list: use string-list API in unsorted_string_list_lookup()Ralf Thielow1-4/+4
2016-04-24t9824: fix broken &&-chain in a subshellSZEDER Gábor1-1/+1
2016-04-24Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maintJiang Xin1-5/+5
2016-04-22mmap(win32): avoid expensive fstat() callJohannes Schindelin1-9/+7
2016-04-22mmap(win32): avoid copy-on-write when it is unnecessaryJohannes Schindelin1-2/+3
2016-04-22win32mmap: set errno appropriatelyJohannes Schindelin1-2/+8
2016-04-22wrapper.c: delete dead function git_mkstemps()Nguyễn Thái Ngọc Duy2-19/+0
2016-04-22dir.c: remove dead function fnmatch_icase()Nguyễn Thái Ngọc Duy2-8/+0
2016-04-22test-lib: simplify '--option=value' parsingSZEDER Gábor1-5/+5
2016-04-20t5504: drop sigpipe=ok from push testsJeff King1-6/+4
2016-04-20fetch-pack: isolate sigpipe in demuxer threadJeff King1-3/+1
2016-04-20send-pack: isolate sigpipe in demuxer threadJeff King1-0/+1
2016-04-20run-command: teach async threads to ignore SIGPIPEJeff King2-0/+11
2016-04-20send-pack: close demux pipe before finishing async processJeff King1-2/+4
2016-04-20replace --edit: respect core.editorJohannes Schindelin1-0/+1
2016-04-19travis-ci: update Git-LFS and P4 to the latest versionLars Schneider1-2/+2
2016-04-19mv: allow moving nested submodulesStefan Beller2-9/+28
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-13imap-send: fix CRAM-MD5 response calculationKazuki Yamaguchi1-1/+1
2016-04-13imap-send: check for NOLOGIN capability only when using LOGIN commandKazuki Yamaguchi1-5/+5
2016-04-12t3404: use write_scriptJunio C Hamano1-4/+3
2016-04-11t1020: do not overuse printf and use write_scriptJunio C Hamano1-5/+5
2016-04-10t5532: use write_scriptJeff King1-9/+12
2016-04-10git_config_set_multivar_in_file: handle "unset" errorsJeff King1-2/+6
2016-04-10git_config_set_multivar_in_file: all non-zero returns are errorsJeff King1-1/+1
2016-04-10config: lower-case first word of error stringsJeff King1-5/+5
2016-04-10http: differentiate socks5:// and socks5h://Junio C Hamano1-1/+4
2016-04-08configure: remove checking for HMAC_CTX_cleanupKazuki Yamaguchi3-13/+0
2016-04-08imap-send: avoid deprecated TLSv1_method()Kazuki Yamaguchi1-5/+4
2016-04-08imap-send: check NULL return of SSL_CTX_new()Kazuki Yamaguchi1-0/+4
2016-04-08imap-send: use HMAC() function provided by OpenSSLKazuki Yamaguchi2-10/+13
2016-04-08set_worktree_head_symref(): fix error messageKazuki Yamaguchi1-1/+2
2016-04-07commit: do not ignore an empty message given by -m ''Jeff King2-6/+6
2016-04-07commit: --amend -m '' silently fails to wipe messageAdam Dinwoodie1-0/+20
2016-04-07setup.c: do not feed NULL to "%.*s" even with precision 0Junio C Hamano1-1/+1
2016-04-06send-email: do not load Data::DumperEric Wong1-1/+0
2016-04-06send-email: more meaningful Message-IDEric Wong1-2/+3
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-04branch: fix shortening of non-remote symrefsJeff King2-7/+24
2016-04-04Windows: shorten code by re-using convert_slashes()Johannes Sixt2-11/+3
2016-04-04git-format-patch.txt: don't show -s as shorthand for multiple optionsEric Sunshine1-1/+1
2016-04-04branch -m: update all per-worktree HEADsKazuki Yamaguchi4-3/+53
2016-04-04refs: add a new function set_worktree_head_symrefKazuki Yamaguchi2-0/+44
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-04-01ident: give "please tell me" message upon useConfigOnly errorMarios Titas1-4/+8
2016-04-01ident: check for useConfigOnly before auto-detection of name/emailMarios Titas1-6/+6
2016-04-01submodule--helper, module_clone: catch fprintf failureStefan Beller1-2/+2
2016-04-01submodule--helper: do not borrow absolute_path() result for too longJunio C Hamano1-5/+4
2016-04-01submodule--helper, module_clone: always operate on absolute pathsStefan Beller2-15/+15
2016-04-01credential-cache, send_request: close fd when doneStefan Beller1-0/+1
2016-04-01bundle: don't leak an fd in case of early returnStefan Beller1-6/+17
2016-04-01abbrev_sha1_in_line: don't leak memoryStefan Beller1-3/+1
2016-04-01notes: don't leak memory in git_config_get_notes_strategyStefan Beller1-2/+3
2016-04-01builtin/apply: free patch when parse_chunk() failsChristian Couder1-1/+3
2016-04-01builtin/apply: handle parse_binary() failureChristian Couder1-0/+7
2016-03-31submodule--helper clone: create the submodule path just onceStefan Beller1-4/+0
2016-03-31submodule--helper: fix potential NULL-dereferenceStefan Beller1-4/+4
2016-03-31recursive submodules: test for relative pathsStefan Beller1-0/+41
2016-03-31git-send-pack: fix --all option when used with directoryStanislav Kolotinskiy2-1/+13
2016-03-30for-each-ref: fix description of '--contains' in manpageSZEDER Gábor1-1/+1
2016-03-30diffcore: fix iteration order of identical files during rename detectionSZEDER Gábor2-2/+15
2016-03-30t7407: make expectation as clear as possibleStefan Beller1-2/+6
2016-03-30submodule update: test recursive path reporting from subdirectoryStefan Beller1-0/+20
2016-03-30submodule update: align reporting path for custom command executionStefan Beller2-5/+28
2016-03-30submodule status: correct path handling in recursive submodulesStefan Beller2-0/+22
2016-03-30submodule update --init: correct path handling in recursive submodulesStefan Beller2-1/+34
2016-03-30submodule foreach: correct path display in recursive submodulesStefan Beller2-3/+23
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-29branch -d: refuse deleting a branch which is currently checked outKazuki Yamaguchi2-8/+20
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-22apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano1-6/+0
2016-03-22builtin/apply: get rid of useless 'name' variableChristian Couder1-8/+5