summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2020-01-13Git 2.25v2.25.0Junio C Hamano1-1/+1
2020-01-12Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-poJunio C Hamano12-24312/+53740
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano7-327/+28
2020-01-12l10n: zh_CN: for git v2.25.0 l10n round 1Jiang Xin1-2275/+2807
2020-01-11Merge branch 'master' of github.com:Softcatala/git-po into git-po-masterJiang Xin1-3757/+4260
2020-01-10Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'Junio C Hamano2-7/+7
2020-01-10Merge branch 'ma/config-advice-markup-fix'Junio C Hamano1-1/+1
2020-01-10l10n: Update Catalan translationJordi Mas1-3757/+4260
2020-01-10mingw: safeguard better against backslashes in file namesJohannes Schindelin via GitGitGadget2-7/+7
2020-01-10l10n: de.po: Update German translation v2.25.0 round 1Matthias Rüster1-2282/+2844
2020-01-10l10n: de.po: Reword generation numbersThomas Braun1-1/+1
2020-01-09l10n: bg.po: Updated Bulgarian translation (4800t)Alexander Shopov1-2353/+2905
2020-01-08config/advice.txt: fix description list separatorMartin Ågren1-1/+1
2020-01-08Git 2.25-rc2v2.25.0-rc2Junio C Hamano2-1/+5
2020-01-08Merge branch 'ds/graph-assert-fix'Junio C Hamano2-8/+80
2020-01-08Merge branch 'tm/doc-submodule-absorb-fix'Junio C Hamano1-1/+1
2020-01-08Merge branch 'pm/am-in-body-header-doc-update'Junio C Hamano1-2/+2
2020-01-08Merge branch 'jb/doc-multi-pack-idx-fix'Junio C Hamano1-1/+1
2020-01-08Merge branch 'do/gitweb-typofix-in-comments'Junio C Hamano1-2/+2
2020-01-08Merge https://github.com/prati0100/git-guiJunio C Hamano10-232/+920
2020-01-08graph: fix lack of color in horizontal linesDerrick Stolee2-4/+38
2020-01-08graph: drop assert() for merge with two collapsing parentsDerrick Stolee2-4/+42
2020-01-06The final batch before -rc2Junio C Hamano1-2/+18
2020-01-06Merge branch 'ds/sparse-cone'Junio C Hamano2-3/+3
2020-01-06Merge branch 'ds/commit-graph-set-size-mult'Junio C Hamano2-4/+4
2020-01-06Merge branch 'en/merge-recursive-oid-eq-simplify'Junio C Hamano1-22/+11
2020-01-06Merge branch 'ds/sparse-list-in-cone-mode'Junio C Hamano3-1/+80
2020-01-06Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'Junio C Hamano3-9/+9
2020-01-06Merge branch 'pb/clarify-line-log-doc'Junio C Hamano2-4/+12
2020-01-06Merge branch 'ew/packfile-syscall-optim'Junio C Hamano1-14/+2
2020-01-06doc: submodule: fix typo for command absorbgitdirsThomas Menzel1-1/+1
2020-01-06l10n: es: 2.25.0 round #1Christopher Diaz Riveros1-2282/+2838
2020-01-04am: document that Date: can appear as an in-body headerPaul Menzel1-2/+2
2020-01-04gitweb: fix a couple spelling errors in commentsDenis Ovsienko1-2/+2
2020-01-04multi-pack-index: correct configuration in documentationJohannes Berg1-1/+1
2020-01-04Documentation/git-sparse-checkout.txt: fix a typoTaylor Blau1-1/+1
2020-01-05Merge branch 'zs/open-current-file'Pratyush Yadav1-5/+24
2020-01-04l10n: sv.po: Update Swedish translation (4800t0f0u)Peter Krefting1-2282/+2825
2020-01-04Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into masterJiang Xin1-2271/+2800
2020-01-03l10n: fr.po v2.25.0 rnd 1Jean-Noël Avila1-2271/+2800
2020-01-03l10n: vi(4800t): Updated Vietnamese translation v2.25.0Tran Ngoc Quan1-2273/+2839
2020-01-02commit-graph: prefer default size_mult when given zeroDerrick Stolee2-4/+4
2020-01-02mingw: only test index entries for backslashes, not tree entriesJohannes Schindelin3-9/+9
2020-01-02Git 2.25-rc1v2.25.0-rc1Junio C Hamano2-1/+14
2020-01-02Merge branch 'js/use-test-tool-on-path'Junio C Hamano1-1/+1
2020-01-02Merge branch 'js/mingw-reserved-filenames'Junio C Hamano3-24/+122
2020-01-02Merge branch 'en/rebase-signoff-fix'Junio C Hamano1-1/+1
2020-01-02Merge branch 'em/freebsd-cirrus-ci'Junio C Hamano1-0/+15
2020-01-02Merge branch 'bk/p4-misc-usability'Junio C Hamano1-32/+42
2020-01-02merge-recursive: remove unnecessary oid_eq functionElijah Newren1-22/+11
2020-01-02sparse-checkout: use extern for global variablesDerrick Stolee1-2/+2
2020-01-01Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-ma...Jiang Xin1-2343/+2974
2019-12-31l10n: zh_TW.po: update translation for v2.25.0 round 1pan934121-2343/+2974
2019-12-31git-gui: allow opening currently selected file in default appZoli Szabó1-5/+24
2019-12-30sparse-checkout: document interactions with submodulesDerrick Stolee2-0/+38
2019-12-30sparse-checkout: list directories in cone modeDerrick Stolee3-1/+42
2019-12-30l10n: it.po: update the Italian translation for Git 2.25.0Alessandro Menti1-2277/+2854
2019-12-30l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)Jiang Xin1-2252/+2755
2019-12-30Merge tag 'v2.25.0-rc0' into git-po-masterJiang Xin518-6607/+17382
2019-12-27t3008: find test-tool through path lookupJohannes Sixt1-1/+1
2019-12-27l10n: Update Catalan translationJordi Mas1-8/+8
2019-12-26packfile: replace lseek+read with preadEric Wong1-3/+2
2019-12-26doc: log, gitk: line-log arguments must exist in starting revisionPhilippe Blain2-2/+4
2019-12-26doc: log, gitk: document accepted line-log diff formatsPhilippe Blain2-2/+8
2019-12-26packfile: remove redundant fcntl F_GETFD/F_SETFDEric Wong1-11/+0
2019-12-26mailmap: mask accentless variant for Công DanhJunio C Hamano1-0/+1
2019-12-25Git 2.25-rc0v2.25.0-rc0Junio C Hamano2-6/+27
2019-12-25Merge branch 'en/fill-directory-fixes'Junio C Hamano3-51/+354
2019-12-25Merge branch 'rs/test-cleanup'Junio C Hamano5-5/+4
2019-12-25Merge branch 'mr/bisect-save-pointer-to-const-string'Junio C Hamano1-2/+2
2019-12-25Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano1-0/+23
2019-12-25Merge branch 'js/add-p-in-c'Junio C Hamano8-19/+1464
2019-12-25Merge branch 'jc/drop-gen-hdrs'Junio C Hamano1-3/+2
2019-12-25Merge branch 'ja/doc-markup-cleanup'Junio C Hamano3-127/+136
2019-12-25Merge branch 'rs/ref-read-cleanup'Junio C Hamano2-4/+3
2019-12-25Merge branch 'rb/p4-lfs'Junio C Hamano1-2/+8
2019-12-25Merge branch 'pb/submodule-doc-xref'Junio C Hamano1-1/+1
2019-12-25Merge branch 'mr/bisect-use-after-free'Junio C Hamano1-3/+4
2019-12-25Merge branch 'ln/userdiff-elixir'Junio C Hamano1-1/+2
2019-12-25Merge branch 'ds/sparse-cone'Junio C Hamano20-48/+1376
2019-12-25Merge branch 'sg/name-rev-wo-recursion'Junio C Hamano2-66/+153
2019-12-25Merge branch 'ra/t5150-depends-on-perl'Junio C Hamano1-0/+6
2019-12-25Merge branch 'dl/format-patch-notes-config-fixup'Junio C Hamano7-39/+125
2019-12-25Merge branch 'am/pathspec-f-f-checkout'Junio C Hamano9-42/+548
2019-12-25Merge branch 'am/pathspec-from-file'Junio C Hamano2-0/+9
2019-12-21mingw: refuse paths containing reserved namesJohannes Schindelin3-18/+110
2019-12-21mingw: short-circuit the conversion of `/dev/null` to UTF-16Johannes Schindelin1-10/+16
2019-12-20sparse-checkout: improve OS ls compatibilityEd Maste1-14/+22
2019-12-20CI: add FreeBSD CI support via Cirrus-CIEd Maste1-0/+15
2019-12-20rebase: fix saving of --signoff state for am-based rebasesElijah Newren1-1/+1
2019-12-20dir.c: use st_add3() for allocation sizeJunio C Hamano1-1/+1
2019-12-19dir: consolidate similar code in treat_directory()Elijah Newren1-11/+7
2019-12-19dir: synchronize treat_leading_path() and read_directory_recursive()Elijah Newren3-2/+32
2019-12-19dir: fix checks on common prefix directoryElijah Newren2-14/+59
2019-12-20Merge branch 'py/console-close-esc'Pratyush Yadav1-0/+2
2019-12-19t4015: improve coverage of function context testRené Scharfe1-0/+23
2019-12-18commit: forbid --pathspec-from-file --allAlexandr Miloslavskiy2-0/+9
2019-12-18t3434: mark successful test as suchElijah Newren1-1/+1
2019-12-18notes.h: fix typos in commentDenton Liu1-2/+2
2019-12-18t6030: don't create unused fileRené Scharfe1-1/+1
2019-12-18t5580: don't create unused fileRené Scharfe1-1/+1
2019-12-18t3501: don't create unused fileRené Scharfe1-1/+1
2019-12-19git-gui: allow closing console window with EscapePratyush Yadav1-0/+2
2019-12-17bisect--helper: convert `*_warning` char pointers to char arrays.Tanushree Tumane1-2/+2
2019-12-16The sixth batchJunio C Hamano1-0/+29
2019-12-16Merge branch 'rs/patch-id-use-oid-to-hex'Junio C Hamano1-7/+2
2019-12-16Merge branch 'rs/commit-export-env-simplify'Junio C Hamano1-1/+1
2019-12-16Merge branch 'rs/archive-zip-code-cleanup'Junio C Hamano1-9/+14
2019-12-16Merge branch 'js/t3404-indent-fix'Junio C Hamano1-5/+5
2019-12-16Merge branch 'dr/branch-usage-casefix'Junio C Hamano1-1/+1
2019-12-16Merge branch 'sg/t9300-robustify'Junio C Hamano1-4/+16
2019-12-16Merge branch 'js/add-i-a-bit-more-tests'Junio C Hamano3-11/+97
2019-12-16Merge branch 'dl/range-diff-with-notes'Junio C Hamano4-6/+7
2019-12-16Merge branch 'hw/doc-in-header'Junio C Hamano48-2452/+1931
2019-12-16Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano2-5/+18
2019-12-16Merge branch 'dl/rebase-with-autobase'Junio C Hamano5-11/+26
2019-12-16Merge branch 'dl/test-cleanup'Junio C Hamano12-323/+425
2019-12-16Merge branch 'cs/store-packfiles-in-hashmap'Junio C Hamano4-9/+52
2019-12-16Merge branch 'js/builtin-add-i-cmds'Junio C Hamano1-59/+560
2019-12-16Merge branch 'dd/time-reentrancy'Junio C Hamano3-19/+21
2019-12-16Merge branch 'ag/sequencer-todo-updates'Junio C Hamano2-9/+29
2019-12-16git-p4: show detailed help when parsing options failBen Keene1-1/+6
2019-12-16git-p4: yes/no prompts should sanitize user textBen Keene1-31/+36
2019-12-16fix-typo: consecutive-word duplicationsryenus5-5/+5
2019-12-13Makefile: drop GEN_HDRSJunio C Hamano1-3/+2
2019-12-13built-in add -p: show helpful hint when nothing can be stagedJohannes Schindelin1-4/+13
2019-12-13built-in add -p: only show the applicable parts of the help textJohannes Schindelin1-4/+28
2019-12-13built-in add -p: implement the 'q' ("quit") commandJohannes Schindelin1-6/+11
2019-12-13built-in add -p: implement the '/' ("search regex") commandJohannes Schindelin2-1/+63
2019-12-13built-in add -p: implement the 'g' ("goto") commandJohannes Schindelin2-0/+104
2019-12-13built-in add -p: implement hunk editingJohannes Schindelin3-17/+325
2019-12-13strbuf: add a helper function to call the editor "on an strbuf"Johannes Schindelin2-0/+39
2019-12-13built-in add -p: coalesce hunks after splitting themJohannes Schindelin1-1/+57
2019-12-13built-in add -p: implement the hunk splitting featureJohannes Schindelin2-2/+225
2019-12-13built-in add -p: show different prompts for mode changes and deletionsJohannes Schindelin1-2/+20
2019-12-13built-in app -p: allow selecting a mode change as a "hunk"Johannes Schindelin1-5/+104
2019-12-13built-in add -p: handle deleted empty filesJohannes Schindelin1-2/+11
2019-12-13built-in add -p: support multi-file diffsJohannes Schindelin1-38/+53
2019-12-13built-in add -p: offer a helpful error message when hunk navigation failedJohannes Schindelin1-11/+33
2019-12-13built-in add -p: color the prompt and the help textJohannes Schindelin1-4/+8
2019-12-13built-in add -p: adjust hunk headers as neededJohannes Schindelin3-23/+151
2019-12-13built-in add -p: show colored hunks by defaultJohannes Schindelin1-17/+62
2019-12-13built-in add -i: wire up the new C code for the `patch` commandJohannes Schindelin1-3/+6
2019-12-13built-in add -i: start implementing the `patch` functionality in CJohannes Schindelin4-5/+277
2019-12-13userdiff: remove empty subexpression from elixir regexEd Maste1-1/+2
2019-12-13doc: indent multi-line items in listJean-Noël Avila2-125/+134
2019-12-13doc: remove non pure ASCII charactersJean-Noël Avila1-2/+2
2019-12-13sparse-checkout: respect core.ignoreCase in cone modeDerrick Stolee4-5/+42
2019-12-13notes: break set_display_notes() into smaller functionsDenton Liu5-32/+45
2019-12-13config/format.txt: clarify behavior of multiple format.notesDenton Liu1-1/+17
2019-12-11gitmodules: link to gitsubmodules guidePhilippe Blain1-1/+1
2019-12-11remote: pass NULL to read_ref_full() because object ID is not neededRené Scharfe1-2/+1
2019-12-11refs: pass NULL to refs_read_ref_full() because object ID is not neededRené Scharfe1-2/+2
2019-12-11t7004: don't create unused fileRené Scharfe1-1/+0
2019-12-11t4256: don't create unused fileRené Scharfe1-1/+1
2019-12-11dir: break part of read_directory_recursive() out for reuseElijah Newren1-23/+37
2019-12-11dir: exit before wildcard fall-through if there is no wildcardElijah Newren2-2/+9
2019-12-11dir: remove stray quote character in commentElijah Newren1-1/+1
2019-12-11Revert "dir.c: make 'git-status --ignored' work within leading directories"Elijah Newren2-5/+7
2019-12-11t3011: demonstrate directory traversal failuresElijah Newren1-0/+209
2019-12-11git-p4: honor lfs.storage configuration variabler.burenkov1-2/+8
2019-12-11bisect--helper: avoid use-after-freeTanushree Tumane1-3/+4
2019-12-11Merge branch 'kk/branch-name-encoding'Pratyush Yadav2-0/+3
2019-12-10The fifth batchJunio C Hamano1-0/+36
2019-12-10Merge branch 'ag/sequencer-continue-leakfix'Junio C Hamano1-2/+4
2019-12-10Merge branch 'em/test-skip-regex-illseq'Junio C Hamano2-3/+9
2019-12-10Merge branch 'hi/gpg-use-check-signature'Junio C Hamano4-75/+72
2019-12-10Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'Junio C Hamano1-1/+1
2019-12-10Merge branch 'sg/test-squelch-noise-in-commit-bulk'Junio C Hamano1-1/+1
2019-12-10Merge branch 'jk/perf-wo-git-dot-pm'Junio C Hamano1-2/+7
2019-12-10Merge branch 'ds/commit-graph-delay-gen-progress'Junio C Hamano5-8/+23
2019-12-10Merge branch 'jt/clone-recursesub-ref-advise'Junio C Hamano5-1/+19
2019-12-10Merge branch 'as/t7812-missing-redirects-fix'Junio C Hamano1-4/+7
2019-12-10Merge branch 'dl/pretty-reference'Junio C Hamano9-26/+134
2019-12-10Merge branch 'dl/submodule-set-url'Junio C Hamano4-2/+113
2019-12-10Merge branch 'js/mingw-inherit-only-std-handles'Junio C Hamano5-12/+199
2019-12-10Merge branch 'po/bundle-doc-clonable'Junio C Hamano2-6/+20
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano6-28/+323
2019-12-10Merge branch 'am/pathspec-from-file'Junio C Hamano9-28/+434
2019-12-09Sync with Git 2.24.1Junio C Hamano47-87/+991
2019-12-09format-patch: move git_config() before repo_init_revisions()Denton Liu1-4/+7
2019-12-09format-patch: use --notes behavior for format.notesDenton Liu2-12/+33
2019-12-09notes: extract logic into set_display_notes()Denton Liu3-16/+38
2019-12-09notes: create init_display_notes() helperDenton Liu3-1/+12
2019-12-09notes: rename to load_display_notes()Denton Liu3-6/+6
2019-12-09name-rev: cleanup name_ref()SZEDER Gábor1-15/+16
2019-12-09name-rev: eliminate recursion in name_rev()SZEDER Gábor2-39/+65
2019-12-09name-rev: use 'name->tip_name' instead of 'tip_name'SZEDER Gábor1-4/+7
2019-12-09archive-zip: use enum for compression methodRené Scharfe1-9/+14
2019-12-10git gui: fix branch name encoding errorKazuhiro Kato2-0/+3
2019-12-09l10n: minor case fix in 'git branch' '--unset-upstream' descriptionDimitriy Ryazantcev1-1/+1
2019-12-09t3404: fix indentationJohannes Schindelin1-5/+5
2019-12-09patch-id: use oid_to_hex() to print multiple object IDsRené Scharfe1-7/+2
2019-12-09commit: use strbuf_add() to add a length-limited stringRené Scharfe1-1/+1
2019-12-06The fourth batchJunio C Hamano1-0/+18
2019-12-06Merge branch 'dl/lore-is-the-archive'Junio C Hamano14-17/+18
2019-12-06Merge branch 'jk/lore-is-the-archive'Junio C Hamano13-30/+30
2019-12-06Merge branch 'tg/perf-remove-stale-result'Junio C Hamano2-11/+5
2019-12-06Merge branch 'jk/send-pack-check-negative-with-quick'Junio C Hamano1-1/+3
2019-12-06Merge branch 'hi/grep-do-not-return-void'Junio C Hamano1-1/+1