summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2018-05-22Git 2.15.2v2.15.2Junio C Hamano2-1/+4
2018-05-22Sync with Git 2.14.4Junio C Hamano17-41/+497
2018-05-22Git 2.14.4v2.14.4Junio C Hamano3-2/+7
2018-05-22Sync with Git 2.13.7Junio C Hamano16-41/+492
2018-05-22Git 2.13.7v2.13.7Junio C Hamano3-2/+22
2018-05-22Merge branch 'jk/submodule-fix-loose' into maint-2.13Junio C Hamano15-41/+472
2018-05-21verify_path: disallow symlinks in .gitmodulesJeff King4-15/+37
2018-05-21update-index: stat updated files earlierJeff King1-8/+17
2018-05-21verify_dotfile: mention case-insensitivity in commentJeff King1-1/+4
2018-05-21verify_path: drop clever fallthroughJeff King1-4/+4
2018-05-21skip_prefix: add case-insensitive variantJeff King1-0/+17
2018-05-21is_{hfs,ntfs}_dotgitmodules: add testsJohannes Schindelin2-0/+106
2018-05-21is_ntfs_dotgit: match other .git filesJohannes Schindelin2-1/+93
2018-05-21is_hfs_dotgit: match other .git filesJeff King2-12/+51
2018-05-21is_ntfs_dotgit: use a size_t for traversing stringJeff King1-1/+1
2018-05-21submodule-config: verify submodule names as pathsJeff King5-0/+143
2017-12-06Prepare for 2.15.2Junio C Hamano2-1/+48
2017-12-06Merge branch 'jc/merge-base-fork-point-doc' into maintJunio C Hamano1-8/+56
2017-12-06Merge branch 'tz/redirect-fix' into maintJunio C Hamano2-2/+2
2017-12-06Merge branch 'tz/notes-error-to-stderr' into maintJunio C Hamano3-9/+9
2017-12-06Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maintJunio C Hamano2-2/+39
2017-12-06Merge branch 'pw/sequencer-recover-from-unlockable-index' into maintJunio C Hamano1-1/+2
2017-12-06Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maintJunio C Hamano2-0/+16
2017-12-06Merge branch 'tz/complete-branch-copy' into maintJunio C Hamano1-1/+1
2017-12-06Merge branch 'ew/rebase-mboxrd' into maintJunio C Hamano2-0/+24
2017-12-06Merge branch 'sd/branch-copy' into maintJunio C Hamano1-2/+2
2017-12-06Merge branch 'sw/pull-ipv46-passthru' into maintJunio C Hamano1-0/+12
2017-12-06Merge branch 'bc/submitting-patches-in-asciidoc' into maintJunio C Hamano3-161/+192
2017-12-06Merge branch 'mh/avoid-rewriting-packed-refs' into maintJunio C Hamano4-1/+238
2017-11-28Git 2.15.1v2.15.1Junio C Hamano1-0/+3
2017-11-28Merge branch 'rs/config-write-section-fix' into maintJunio C Hamano1-1/+1
2017-11-27A bit more fixes for 2.15.1Junio C Hamano1-0/+5
2017-11-27Merge branch 'ma/reduce-heads-leakfix' into maintJunio C Hamano7-23/+52
2017-11-27Merge branch 'ma/bisect-leakfix' into maintJunio C Hamano3-19/+29
2017-11-27Merge branch 'rs/apply-fuzzy-match-fix' into maintJunio C Hamano1-39/+20
2017-11-27Merge branch 'ad/submitting-patches-title-decoration' into maintJunio C Hamano1-8/+13
2017-11-27Merge branch 'rs/imap-send-next-arg-fix' into maintJunio C Hamano1-2/+13
2017-11-26RelNotes: minor typo fixes in 2.15.1 draftTodd Zullinger1-3/+3
2017-11-21Almost ready for 2.15.1Junio C Hamano1-0/+12
2017-11-21Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintJunio C Hamano1-29/+16
2017-11-21Merge branch 'cb/t4201-robustify' into maintJunio C Hamano2-5/+7
2017-11-21Merge branch 'tz/fsf-address-update' into maintJunio C Hamano44-103/+69
2017-11-21Merge branch 'ad/rebase-i-serie-typofix' into maintJunio C Hamano1-1/+1
2017-11-21Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano1-1/+3
2017-11-21Merge branch 'ab/pcre-v2' into maintJunio C Hamano2-3/+4
2017-11-21Merge branch 'sr/wrapper-quote-filenames' into maintJunio C Hamano3-6/+6
2017-11-21Merge branch 'bw/rebase-i-ignored-submodule-fix' into maintJunio C Hamano2-1/+20
2017-11-21pull: pass -4/-6 option to 'git fetch'Shuyu Wei1-0/+12
2017-11-18config: flip return value of write_section()René Scharfe1-1/+1
2017-11-18rebase: use mboxrd format to avoid split errorsEric Wong2-0/+24
2017-11-17apply: update line lengths for --inaccurate-eofRené Scharfe2-0/+16
2017-11-17completion: add '--copy' option to 'git branch'Todd Zullinger1-1/+1
2017-11-16sequencer: reschedule pick if index can't be lockedPhillip Wood1-1/+2
2017-11-16config: avoid "write_in_full(fd, buf, len) != len" patternPhillip Wood1-2/+2
2017-11-15merge-recursive: handle addition of submodule on our side of historyElijah Newren2-3/+4
2017-11-15Start preparation for 2.15.1Junio C Hamano3-2/+70
2017-11-15Merge branch 'ks/mailmap' into maintJunio C Hamano1-0/+1
2017-11-15Merge branch 'jm/relnotes-2.15-typofix' into maintJunio C Hamano1-3/+3
2017-11-15Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintJunio C Hamano4-9/+6
2017-11-15Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano3-0/+88
2017-11-15Merge branch 'js/wincred-empty-cred' into maintJunio C Hamano2-2/+27
2017-11-15Merge branch 'js/mingw-full-version-in-resources' into maintJunio C Hamano2-3/+4
2017-11-15Merge branch 'dk/libsecret-unlock-to-load-fix' into maintJunio C Hamano1-1/+1
2017-11-15Merge branch 'js/early-config' into maintJunio C Hamano1-1/+3
2017-11-15Merge branch 'ad/5580-unc-tests-on-cygwin' into maintJunio C Hamano1-4/+10
2017-11-15Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maintJunio C Hamano1-8/+6
2017-11-15Merge branch 'sb/blame-config-doc' into maintJunio C Hamano1-0/+17
2017-11-15Merge branch 'tb/complete-checkout' into maintJunio C Hamano2-1/+6
2017-11-15Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano4-4/+32
2017-11-15Merge branch 'jc/t5601-copy-workaround' into maintJunio C Hamano1-0/+2
2017-11-15Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2-1/+17
2017-11-15Merge branch 'bw/grep-recurse-submodules' into maintJunio C Hamano1-0/+2
2017-11-15Merge branch 'js/submodule-in-excluded' into maintJunio C Hamano2-1/+12
2017-11-15Merge branch 'ao/check-resolve-ref-unsafe-result' into maintJunio C Hamano1-0/+2
2017-11-15Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maintJunio C Hamano4-4/+5
2017-11-15Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maintJunio C Hamano3-78/+32
2017-11-15Merge branch 'jk/diff-color-moved-fix' into maintJunio C Hamano2-42/+188
2017-11-15Merge branch 'kd/auto-col-with-pager-fix' into maintJunio C Hamano2-1/+15
2017-11-15Merge branch 'sg/travis-fixes' into maintJunio C Hamano3-7/+13
2017-11-15notes: send "Automatic notes merge failed" messages to stderrTodd Zullinger3-9/+9
2017-11-14rebase: fix stderr redirect in apply_autostash()Todd Zullinger1-1/+1
2017-11-14t/lib-gpg: fix gpgconf stderr redirect to /dev/nullTodd Zullinger1-1/+1
2017-11-13link_alt_odb_entries: make empty input a noopJeff King1-1/+3
2017-11-13Documentation: convert SubmittingPatches to AsciiDocbrian m. carlson3-161/+191
2017-11-13grep: fix NO_LIBPCRE1_JIT to fully disable JITCharles Bailey2-3/+4
2017-11-13t4201: make use of abbreviation in the test more robustCharles Bailey2-5/+7
2017-11-12t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureStefan Beller1-0/+36
2017-11-12apply: avoid out-of-bounds access in fuzzy_matchlines()René Scharfe1-39/+20
2017-11-11doc/SubmittingPatches: correct subject guidanceAdam Dinwoodie1-8/+13
2017-11-09Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-updateJunio C Hamano1-2/+1
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger1-2/+1
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger43-101/+68
2017-11-09rebase -i: fix comment typoAdam Dinwoodie1-1/+1
2017-11-09merge-base --fork-point doc: clarify the example and failure modesJunio C Hamano1-8/+56
2017-11-08reduce_heads: fix memory leaksMartin Ågren7-6/+35
2017-11-08builtin/merge-base: free commit listsMartin Ågren1-18/+18
2017-11-07wt-status: actually ignore submodules when requestedBrandon Williams2-1/+20
2017-11-06wrapper.c: consistently quote filenames in error messagesSimon Ruderich3-6/+6
2017-11-06fix typos in 2.15.0 release notesJean Carlo Machado1-3/+3
2017-11-06bisect: fix memory leak when returning best elementMartin Ågren1-1/+5
2017-11-06bisect: fix off-by-one error in `best_bisection_sorted()`Martin Ågren1-3/+4
2017-11-06bisect: fix memory leak in `find_bisection()`Martin Ågren1-1/+3
2017-11-06bisect: change calling-convention of `find_bisection()`Martin Ågren3-14/+17
2017-11-06config: document blame configurationStefan Beller1-0/+17
2017-11-04credential-libsecret: unlock locked secretsDennis Kaarsemaker1-1/+1
2017-11-03setup: avoid double slashes when looking for HEADJeff King1-1/+3
2017-11-03mailmap: use Kaartic Sivaraam's new addressKaartic Sivaraam1-0/+1
2017-11-03imap-send: handle missing response codes gracefullyRené Scharfe1-1/+1
2017-11-03imap-send: handle NULL return of next_arg()René Scharfe1-1/+12
2017-11-02diff: --indent-heuristic is no longer experimentalCarlos Martín Nieto4-9/+6
2017-11-02sequencer.c: check return value of close() in rewrite_file()Simon Ruderich1-1/+2
2017-11-02mingw: document the standard handle redirectionJohannes Schindelin1-0/+18
2017-11-02mingw: optionally redirect stderr/stdout via the same handleJohannes Schindelin2-1/+22
2017-11-02mingw: add experimental feature to redirect standard handlesJohannes Schindelin2-0/+49
2017-11-02travis-ci: don't build Git for the static analysis jobSZEDER Gábor1-1/+1
2017-11-02travis-ci: fix running P4 and Git LFS tests in Linux build jobsSZEDER Gábor2-6/+12
2017-11-02grep: take the read-lock when adding a submoduleMartin Ågren1-0/+2
2017-11-02sequencer: pass absolute GIT_DIR to exec commandsJacob Keller2-1/+17
2017-11-01wincred: handle empty username/password correctlyJakub Bereżański1-2/+8
2017-11-01t0302: check helper can handle empty credentialsJakub Bereżański1-0/+19
2017-11-01mingw: include the full version information in the resourcesJohannes Schindelin2-3/+4
2017-11-01sequencer: use O_TRUNC to truncate filesRené Scharfe1-3/+1
2017-11-01sequencer: factor out rewrite_file()René Scharfe1-29/+17
2017-11-01t5580: add Cygwin supportAdam Dinwoodie1-4/+10
2017-10-30Git 2.15v2.15.0Junio C Hamano1-1/+1
2017-10-30Documentation: enable compat-mode for Asciidoctorbrian m. carlson1-0/+1
2017-10-30files-backend: don't rewrite the `packed-refs` file unnecessarilyMichael Haggerty4-3/+122
2017-10-30Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-poJunio C Hamano1-58/+123
2017-10-29l10n: Update Catalan translationJordi Mas1-58/+123
2017-10-29diff: fix lstat() error handling in diff_populate_filespec()Andrey Okoshkin1-8/+6
2017-10-28Hopefully final batch before 2.15Junio C Hamano1-0/+7
2017-10-28Merge branch 'sg/rev-list-doc-reorder-fix'Junio C Hamano1-3/+3
2017-10-28Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano1-1/+1
2017-10-28Merge branch 'ao/path-use-xmalloc'Junio C Hamano1-1/+1
2017-10-28Merge branch 'np/config-path-doc'Junio C Hamano1-4/+4
2017-10-27docs: fix formatting of rev-parse's --show-superproject-working-treeSebastian Schuberth1-1/+1
2017-10-27rev-list-options.txt: use correct directional referenceSZEDER Gábor1-3/+3
2017-10-27t1409: check that `packed-refs` is not rewritten unnecessarilyMichael Haggerty1-0/+118
2017-10-26Merge branch 'mh/ref-locking-fix'Junio C Hamano2-1/+142
2017-10-26status: do not get confused by submodules in excluded directoriesJohannes Schindelin2-1/+12
2017-10-26diff.c: get rid of duplicate implementationStefan Beller1-78/+4
2017-10-26xdiff-interface: export comparing and hashing stringsStefan Beller2-0/+28
2017-10-25path.c: use xmalloc() in add_to_trie()Andrey Okoshkin1-1/+1
2017-10-25completion: add remaining flags to checkoutThomas Braun2-1/+6
2017-10-25files_transaction_prepare(): fix handling of ref lock failureMichael Haggerty2-9/+9
2017-10-25t1404: add a bunch of tests of D/F conflictsMichael Haggerty1-0/+141
2017-10-24Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano12-24768/+42782
2017-10-24Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/gitJiang Xin1-2414/+2557
2017-10-24l10n: zh_CN: review for git v2.15.0 l10n round 2Ray Chen1-2/+2
2017-10-24l10n: zh_CN: for git v2.15.0 l10n round 2Jiang Xin1-2414/+2557
2017-10-24Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin1-2448/+2630
2017-10-24column: do not include pager.cJunio C Hamano1-1/+0
2017-10-23l10n: de.po: fix typosAndre Hinrichs1-14/+14
2017-10-23l10n: de.po: translate 70 new messagesRalf Thielow1-2435/+2617
2017-10-23Sync with 2.14.3Junio C Hamano1-0/+24
2017-10-23Git 2.14.3v2.14.3Junio C Hamano2-1/+25
2017-10-23Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano1-20/+11
2017-10-23Merge branch 'jc/fetch-refspec-doc-update' into maintJunio C Hamano1-2/+4
2017-10-23Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano22-67/+65
2017-10-23Merge branch 'rj/no-sign-compare' into maintJunio C Hamano10-24/+25
2017-10-23Merge branch 'ma/ts-cleanups' into maintJunio C Hamano6-3/+37
2017-10-23Merge branch 'ls/travis-scriptify' into maintJunio C Hamano10-81/+154
2017-10-23Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maintJunio C Hamano2-3/+145
2017-10-23Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2-15/+51
2017-10-23Merge branch 'nd/worktree-kill-parse-ref' into maintJunio C Hamano3-3/+17
2017-10-22l10n: ru.po: update Russian translationDimitriy Ryazantcev1-50/+50
2017-10-22Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-51/+55
2017-10-21worktree: handle broken symrefs in find_shared_symref()Jeff King1-1/+2
2017-10-21log: handle broken HEAD in decoration checkJeff King1-1/+1
2017-10-21remote: handle broken symrefsJeff King1-1/+1
2017-10-21test-ref-store: avoid passing NULL to printfJeff King1-1/+1
2017-10-21commit: check result of resolve_ref_unsafeAndrey Okoshkin1-0/+2
2017-10-21diff: handle NULs in get_string_hash()Jeff King1-1/+1
2017-10-21diff: fix whitespace-skipping with --color-movedJeff King2-5/+77
2017-10-21t4015: test the output of "diff --color-moved -b"Jeff King1-9/+64
2017-10-21t4015: check "negative" case for "-w --color-moved"Jeff King1-8/+18
2017-10-21t4015: refactor --color-moved whitespace testJeff King1-20/+29
2017-10-19Git 2.15-rc2v2.15.0-rc2Junio C Hamano2-1/+13
2017-10-19Merge branch 'jc/branch-force-doc-readability-fix'Junio C Hamano1-2/+2
2017-10-19Merge branch 'dg/filter-branch-filter-order-doc'Junio C Hamano2-16/+16
2017-10-19Merge branch 'jc/fetch-refspec-doc-update'Junio C Hamano1-2/+4
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano2-6/+6
2017-10-19config doc: clarify "git config --path" exampleNathan Payre1-4/+4
2017-10-19Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/gitJiang Xin1-2427/+2612
2017-10-19Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-55/+58
2017-10-19Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin1-3008/+2991
2017-10-19Merge branch 'translation' of https://github.com/ChrisADR/git-poJiang Xin1-50/+54
2017-10-19l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2Tran Ngoc Quan1-51/+55
2017-10-18l10n: sv.po: Update Swedish translation (3245t0f0u)Peter Krefting1-55/+58
2017-10-18l10n: fr.po: v2.15.0 round 2Jean-Noel Avila1-2424/+2612
2017-10-18l10n: fr.po change translation of "First, rewinding"Nicolas Cornu1-2/+1
2017-10-18l10n: fr.po fix some mistakesJean-Noel Avila1-7/+5
2017-10-18Sync with maintJunio C Hamano2-46/+75
2017-10-18Prepare for 2.14.3Junio C Hamano2-1/+76
2017-10-18Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano23-71/+103
2017-10-18Merge branch 'jc/doc-checkout' into maintJunio C Hamano1-14/+16
2017-10-18Merge branch 'tb/complete-describe' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'rs/rs-mailmap' into maintJunio C Hamano1-0/+1
2017-10-18Merge branch 'rs/fsck-null-return-from-lookup' into maintJunio C Hamano2-4/+26
2017-10-18Merge branch 'jk/sha1-loose-object-info-fix' into maintJunio C Hamano1-2/+6