summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-01-12Git 2.2.2v2.2.2Junio C Hamano3-2/+33
2015-01-12Merge branch 'jk/read-packed-refs-without-path-max' into maintJunio C Hamano1-21/+25
2015-01-12Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2-2/+8
2015-01-12Merge branch 'mh/find-uniq-abbrev' into maintJunio C Hamano1-1/+1
2015-01-12Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintJunio C Hamano2-9/+15
2015-01-12Merge branch 'rw/apply-does-not-take-ignore-date' into maintJunio C Hamano1-1/+0
2015-01-12Merge branch 'jk/for-each-reflog-ent-reverse' into maintJunio C Hamano2-12/+67
2015-01-07Merge branch 'maint-2.1' into maintJunio C Hamano2-12/+35
2015-01-07Merge branch 'maint-2.0' into maint-2.1Junio C Hamano2-12/+35
2015-01-07Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2-12/+35
2015-01-07Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2-12/+35
2015-01-07Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2-12/+35
2014-12-29is_hfs_dotgit: loosen over-eager match of \u{..47}Jeff King2-12/+35
2014-12-22Prepare for 2.2.2Junio C Hamano2-1/+34
2014-12-22Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintJunio C Hamano1-4/+10
2014-12-22Merge branch 'jk/no-perl-tests' into maintJunio C Hamano3-4/+4
2014-12-22Merge branch 'po/everyday-doc' into maintJunio C Hamano1-1/+1
2014-12-22Merge branch 'jk/push-simple' into maintJunio C Hamano2-6/+34
2014-12-22Merge branch 'mh/config-flip-xbit-back-after-checking' into maintJunio C Hamano2-1/+9
2014-12-22Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maintJunio C Hamano1-1/+5
2014-12-22Merge branch 'rs/receive-pack-use-labs' into maintJunio C Hamano1-1/+1
2014-12-22Merge branch 'rs/maint-config-use-labs' into maintJunio C Hamano1-2/+2
2014-12-22Merge branch 'js/windows-open-eisdir-error' into maintJunio C Hamano1-1/+1
2014-12-22Merge branch 'jk/colors-fix' into maintJunio C Hamano3-14/+25
2014-12-22Merge branch 'jk/checkout-from-tree' into maintJunio C Hamano2-0/+35
2014-12-22clean: typofixAlexander Kuleshov1-1/+1
2014-12-17Git 2.2.1v2.2.1Junio C Hamano4-3/+38
2014-12-17Sync with v2.1.4Junio C Hamano19-42/+406
2014-12-17Git 2.1.4v2.1.4Junio C Hamano4-3/+38
2014-12-17Sync with v2.0.5Junio C Hamano18-41/+370
2014-12-17Git 2.0.5v2.0.5Junio C Hamano4-3/+38
2014-12-17Sync with v1.9.5Junio C Hamano17-40/+334
2014-12-17Git 1.9.5v1.9.5Junio C Hamano4-3/+38
2014-12-17Sync with v1.8.5.6Junio C Hamano16-39/+297
2014-12-17Git 1.8.5.6v1.8.5.6Junio C Hamano4-3/+38
2014-12-17Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano14-38/+261
2014-12-17fsck: complain about NTFS ".git" aliases in treesJohannes Schindelin2-3/+9
2014-12-17read-cache: optionally disallow NTFS .git variantsJohannes Schindelin7-0/+34
2014-12-17path: add is_ntfs_dotgit() helperJohannes Schindelin2-0/+34
2014-12-17fsck: complain about HFS+ ".git" aliases in treesJeff King2-4/+7
2014-12-17read-cache: optionally disallow HFS+ .git variantsJeff King8-5/+45
2014-12-17utf8: add is_hfs_dotgit() helperJeff King2-0/+72
2014-12-17fsck: notice .git case-insensitivelyJeff King2-1/+2
2014-12-17t1450: refactor ".", "..", and ".git" fsck testsJeff King1-30/+27
2014-12-17verify_dotfile(): reject .git case-insensitivelyJeff King2-2/+4
2014-12-17read-tree: add tests for confusing paths like ".." and ".git"Jeff King1-0/+32
2014-12-17unpack-trees: propagate errors adding entries to the indexJeff King1-4/+6
2014-12-10read_packed_refs: use skip_prefix instead of static arrayJeff King1-3/+2
2014-12-10read_packed_refs: pass strbuf to parse_ref_lineJeff King1-12/+15
2014-12-10read_packed_refs: use a strbuf for reading linesJeff King1-9/+11
2014-12-09git-am.txt: --ignore-date flag is not passed to git-applyRonald Wampler1-1/+0
2014-12-05Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-9/+9
2014-12-05Start post 2.2 cycleJunio C Hamano1-1/+1
2014-12-05for_each_reflog_ent_reverse: turn leftover check into assertionJeff King1-1/+1
2014-12-05for_each_reflog_ent_reverse: fix newlines on block boundariesJeff King2-11/+66
2014-11-30push: truly use "simple" as default, not "upstream"Jeff King2-6/+34
2014-11-29Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin1-9/+9
2014-11-28l10n: de.po: fix typosHartmut Henkel1-9/+9
2014-11-26Git 2.2v2.2.0Junio C Hamano2-1/+6
2014-11-26RelNotes: spelling & grammar tweaksMarc Branchaud1-51/+52
2014-11-26sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrevMike Hommey1-1/+1
2014-11-21Git 2.2.0-rc3v2.2.0-rc3Junio C Hamano2-14/+15
2014-11-21add: ignore only ignored filesMichael J Gruber2-2/+8
2014-11-20t4026: test "normal" colorJeff King1-0/+8
2014-11-20config: fix parsing of "git config --get-color some.key -1"Jeff King1-14/+13
2014-11-20docs: describe ANSI 256-color modeJeff King1-0/+4
2014-11-20l10n: remove a superfluous translation for push.cJiang Xin6-30/+6
2014-11-20l10n: de.po: translate 2 messagesRalf Thielow1-3/+1
2014-11-20l10n: de.po: translate 2 new messagesRalf Thielow1-2/+2
2014-11-20l10n: batch updates for one trivial changeJiang Xin7-519/+554
2014-11-20l10n: git.pot: v2.2.0 round 2 (1 updated)Jiang Xin1-24/+24
2014-11-19Merge branch 'sv/submitting-final-patch'Junio C Hamano1-1/+1
2014-11-19Merge branch 'sn/tutorial-status-output-example'Junio C Hamano2-19/+21
2014-11-19Merge branch 'mh/doc-remote-helper-xref'Junio C Hamano5-0/+22
2014-11-19Merge branch 'tb/no-relative-file-url'Junio C Hamano1-1/+1
2014-11-19Merge branch 'cc/interpret-trailers'Junio C Hamano1-4/+10
2014-11-18gitweb: hack around CGI's list-context param() handlingJeff King1-1/+5
2014-11-18Makefile: have python scripts depend on NO_PYTHON settingJonathan Nieder1-0/+3
2014-11-18Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macrosJonathan Nieder1-5/+5
2014-11-18Merge git://github.com/git-l10n/git-poJunio C Hamano1-2165/+2392
2014-11-18Merge branch 'jc/doc-commit-only'Junio C Hamano1-2/+3
2014-11-18Merge branch 'ta/tutorial-modernize'Junio C Hamano1-1/+1
2014-11-18Merge branch 'da/difftool'Junio C Hamano2-0/+6
2014-11-18t960[34]: mark cvsimport tests as requiring perlJeff King2-3/+3
2014-11-18t0090: mark add-interactive test with PERL prerequisiteJeff King1-1/+1
2014-11-18Makefile: have perl scripts depend on NO_PERL settingJeff King1-0/+3
2014-11-18create_default_files(): don't set u+x bit on $GIT_DIR/configMichael Haggerty2-1/+9
2014-11-17l10n: Update Catalan translationAlex Henrie1-2165/+2392
2014-11-17Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano1-1990/+2239
2014-11-17Documentation: change "gitlink" typo in git-pushbrian m. carlson1-1/+1
2014-11-17use labs() for variables of type long instead of abs()René Scharfe1-1/+1
2014-11-17use labs() for variables of type long instead of abs()René Scharfe1-2/+2
2014-11-17Windows: correct detection of EISDIR in mingw_open()Johannes Sixt1-1/+1
2014-11-15l10n: de.po: translate 62 new messagesRalf Thielow1-1414/+1663
2014-11-15l10n: de.po: Fixup one translationStefan Beller1-4/+4
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2-0/+6
2014-11-14Git 2.2.0-rc2v2.2.0-rc2Junio C Hamano1-1/+1
2014-11-14l10n: de.po: use imperative form for command optionsRalf Thielow1-573/+573
2014-11-13approxidate: allow ISO-like dates far in the futureJeff King2-2/+5
2014-11-13checkout $tree: do not throw away unchanged index entriesJeff King2-0/+35
2014-11-13pass TIME_DATE_NOW to approxidate future-checkJeff King1-7/+10
2014-11-13gittutorial: fix output of 'git status'Stefan Naewe2-19/+21
2014-11-13t5705: the file:// URL should be absoluteTorsten Bögershausen1-1/+1
2014-11-13SubmittingPatches: final submission is To: maintainer and CC: listSlavomir Vlcek1-1/+1
2014-11-12Update draft release notes to 2.2Junio C Hamano1-0/+14
2014-11-12Sync with 'maint'Junio C Hamano0-0/+0
2014-11-12Merge branch 'nd/gitignore-trailing-whitespace' into maintJunio C Hamano1-1/+1
2014-11-12Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano1-18/+18
2014-11-11doc: add some crossrefs between manual pagesMax Horn5-0/+22
2014-11-11gittutorial.txt: remove reference to ancient Git versionThomas Ackermann1-1/+1
2014-11-11Sync with maintJunio C Hamano0-0/+0
2014-11-11Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano1-1/+1
2014-11-10run-command: use void to declare that functions take no parametersRené Scharfe1-2/+2
2014-11-10Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano6-8882/+10327
2014-11-10Sync with maintJunio C Hamano1-2/+2
2014-11-10Merge branch 'js/diff-highlight-avoid-sigpipe'Junio C Hamano1-0/+4
2014-11-10Documentation/config.txt: fix minor typoThomas Quinot1-1/+1
2014-11-10config.txt: fix typoNicolas Dermine1-1/+1
2014-11-10trailer: use CHILD_PROCESS_INIT in apply_command()René Scharfe1-2/+1
2014-11-10trailer: display a trailer without its trailing newlineChristian Couder1-2/+6
2014-11-10trailer: ignore comment lines inside the trailersChristian Couder1-2/+4
2014-11-10t1410: fix breakage on case-insensitive filesystemsJeff King1-18/+18
2014-11-07Git 2.2.0-rc1v2.2.0-rc1Junio C Hamano1-1/+1
2014-11-07Documentation/git-commit: clarify that --only/--include records the working t...Junio C Hamano1-2/+3
2014-11-06Merge branch 'maint'Junio C Hamano1-1/+1
2014-11-06Merge branch 'nd/gitignore-trailing-whitespace'Junio C Hamano1-1/+1
2014-11-06Merge branch 'tm/line-log-first-parent'Junio C Hamano2-0/+8
2014-11-06Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano4-3/+77
2014-11-06Merge branch 'rs/use-child-process-init-more'Junio C Hamano4-66/+106
2014-11-06Merge branch 'jk/cache-tree-protect-from-broken-libgit2'Junio C Hamano1-0/+2
2014-11-06docs/credential-store: s/--store/--file/Jeff King1-1/+1
2014-11-04gitignore.txt: fix spelling of "backslash"Ben North1-1/+1
2014-11-04diff-highlight: exit when a pipe is brokenJohn Szakmeister1-0/+4
2014-11-04Documentation: typofixesThomas Ackermann19-30/+30
2014-11-04line-log: fix crash when --first-parent is usedTzvetan Mikov2-0/+8
2014-11-04ignore stale directories when checking reflog existenceJeff King2-2/+36
2014-11-04fetch: load all default config at startupJeff King2-1/+41
2014-11-03RelNotes/2.2.0.txt: fix minor typosMatthieu Moy1-3/+3
2014-11-02l10n: Updated Bulgarian translation of git (2296t,0f,0u)Alexander Shopov1-1473/+1738
2014-11-02l10n: zh_CN: translations for git v2.2.0-rc0Jiang Xin1-1477/+1720
2014-11-02Merge branch 'fr_2.2.0' of git://github.com/jnavila/gitJiang Xin1-1478/+1721
2014-11-02Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-1468/+1719
2014-11-01l10n: sv.po: Update Swedish translation (2296t0f0u)Peter Krefting1-1468/+1719
2014-11-01l10n: fr.po (2296t) update for version 2.2.0Jean-Noel Avila1-1478/+1721
2014-11-01l10n: vi.po: Update new message stringsTran Ngoc Quan1-1529/+1777
2014-11-01l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)Jiang Xin1-1457/+1652
2014-10-31Git 2.2.0-rc0v2.2.0-rc0Junio C Hamano2-1/+7
2014-10-31Merge branch 'for-junio' of git://bogomips.org/git-svnJunio C Hamano4-91/+145
2014-10-31Merge branch 'jc/push-cert'Junio C Hamano1-2/+2
2014-10-31Merge branch 'rs/child-process-init'Junio C Hamano1-1/+1
2014-10-31Merge branch 'rs/grep-color-words'Junio C Hamano4-9/+123
2014-10-31git-svn: use SVN::Ra::get_dir2 when possibleEric Wong1-1/+11
2014-10-30bundle: split out ref writing from bundle_createJeff King1-39/+58
2014-10-30bundle: split out a helper function to compute and write prerequisitesJunio C Hamano1-24/+35
2014-10-30bundle: split out a helper function to create pack dataJunio C Hamano1-27/+37
2014-10-30cache-tree: avoid infinite loop on zero-entry treeJeff King1-0/+2
2014-10-30Merge git://ozlabs.org/~paulus/gitkJunio C Hamano1-69/+23
2014-10-30git-svn: add space after "W:" prefix in warningEric Wong1-4/+2
2014-10-30git-svn: (cleanup) remove editor param passingEric Wong1-6/+4
2014-10-30gitk: Remove boilerplate for configuration variablesMax Kirillov1-68/+20
2014-10-30gitk: Show detached HEAD if --all is specifiedMax Kirillov1-0/+2
2014-10-30gitk: Do not depend on Cygwin's "kill" command on WindowsSebastian Schuberth1-1/+1
2014-10-29git-svn: prepare SVN::Ra config pieces onceEric Wong1-27/+36
2014-10-29Git.pm: add specified name to tempfile templateEric Wong1-1/+4
2014-10-29Sync with Git 2.1.3Junio C Hamano2-1/+28
2014-10-29Git 2.1.3v2.1.3Junio C Hamano4-3/+30
2014-10-29Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2-0/+10
2014-10-29Merge branch 'da/mergetool-meld' into maintJunio C Hamano2-2/+16
2014-10-29Merge branch 'rm/gitweb-start-form' into maintJunio C Hamano1-2/+2
2014-10-29Merge branch 'bc/asciidoc-pretty-formats-fix' into maintJunio C Hamano1-1/+1
2014-10-29Merge branch 'rs/daemon-fixes' into maintJunio C Hamano1-18/+15
2014-10-29Update draft release notes to 2.2Junio C Hamano1-0/+17
2014-10-29Merge branch 'da/difftool'Junio C Hamano4-1/+85
2014-10-29Merge branch 'rb/pack-window-memory-config-doc'Junio C Hamano1-4/+5
2014-10-29Merge branch 'mg/lib-gpg-ro-safety'Junio C Hamano1-0/+1
2014-10-29Merge branch 'dm/port2zos'Junio C Hamano3-3/+7
2014-10-29Merge branch 'oc/mergetools-beyondcompare'Junio C Hamano4-27/+28
2014-10-29Merge branch 'jk/prune-mtime'Junio C Hamano23-436/+836
2014-10-29Merge branch 'bc/asciidoctor'Junio C Hamano1-11/+15
2014-10-28api-run-command: add missing list item markerRené Scharfe1-1/+1
2014-10-28use child_process_init() to initialize struct child_process variablesRené Scharfe4-4/+4
2014-10-28receive-pack: avoid minor leak in case start_async() failsRené Scharfe1-2/+2
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar4-0/+75
2014-10-28grep: add color.grep.matchcontext and color.grep.matchselectedRené Scharfe4-9/+123
2014-10-28config.txt: pack.windowmemory limit applies per-threadRobert de Bath1-4/+5
2014-10-27t/lib-gpg: make gpghome files writableMichael J Gruber1-0/+1
2014-10-27Documentation: remove Asciidoctor linkgit macrobrian m. carlson1-39/+0
2014-10-27Documentation: refactor common operations into variablesbrian m. carlson1-11/+11
2014-10-27compat/bswap.h: detect endianness from XL C compiler macrosDavid Michael1-0/+4
2014-10-27Makefile: reorder linker flags in the git executable ruleDavid Michael1-2/+2
2014-10-27git-compat-util.h: support variadic macros with the XL C compilerDavid Michael1-1/+1
2014-10-27difftool--helper: exit when reading a prompt answer failsJohannes Sixt2-1/+10
2014-10-27git-svn: disable _rev_list memoizationEric Wong1-10/+0
2014-10-25git-svn: save a little memory as fetch progressesEric Wong1-1/+1