summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-12-01convert: git cherry-pick -Xrenormalize did not workLibravatar Torsten Bögershausen1-6/+7
2016-12-01Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlfLibravatar Junio C Hamano2-43/+60
2016-11-28merge-recursive: handle NULL in add_cacheinfo() correctlyLibravatar Johannes Schindelin2-1/+3
2016-11-28cherry-pick: demonstrate a segmentation faultLibravatar Johannes Schindelin1-0/+12
2016-08-14convert: Correct NNO tests and missing `LF will be replaced by CRLF`Libravatar Torsten Bögershausen2-43/+60
2016-07-12merge: avoid "safer crlf" during recording of merge resultsLibravatar Junio C Hamano4-31/+43
2016-07-06convert: unify the "auto" handling of CRLFLibravatar Torsten Bögershausen7-59/+69
2016-04-25convert.c: ident + core.autocrlf didn't workLibravatar Torsten Bögershausen2-13/+8
2016-04-25t0027: test cases for combined attributesLibravatar Torsten Bögershausen1-169/+129
2016-04-25convert: allow core.autocrlf=input and core.eol=crlfLibravatar Torsten Bögershausen2-7/+3
2016-04-25t0027: make commit_chk_wrnNNO() reliableLibravatar Torsten Bögershausen1-1/+2
2016-03-28Git 2.8Libravatar Junio C Hamano3-9/+14
2016-03-24Merge branch 'ls/p4-doc-markup'Libravatar Junio C Hamano1-6/+4
2016-03-24Merge branch 'js/mingw-tests-2.8'Libravatar Junio C Hamano4-11/+19
2016-03-24Merge branch 'sb/submodule-module-list-pathspec-fix'Libravatar Junio C Hamano2-3/+16
2016-03-23Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano3-3761/+11533
2016-03-23Documentation: fix git-p4 AsciiDoc formattingLibravatar Lars Schneider1-5/+3
2016-03-23mingw: skip some tests in t9115 due to file name issuesLibravatar Johannes Schindelin1-2/+2
2016-03-23t1300: fix the new --show-origin tests on WindowsLibravatar Johannes Schindelin1-3/+6
2016-03-23t1300-repo-config: make it resilient to being run via 'sh -x'Libravatar Johannes Schindelin1-6/+2
2016-03-23config --show-origin: report paths with forward slashesLibravatar Johannes Schindelin2-0/+9
2016-03-23Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-30/+125
2016-03-23Merge branch 'master' of git://github.com/alexhenrie/git-poLibravatar Jiang Xin1-1365/+1581
2016-03-22submodule: fix regression for deinit without submodulesLibravatar Stefan Beller2-3/+16
2016-03-22l10n: pt_PT: Update and add new translationsLibravatar Vasco Almeida1-2366/+9827
2016-03-21l10n: ca.po: update translationLibravatar Alex Henrie1-1365/+1581
2016-03-21Git 2.8-rc4Libravatar Junio C Hamano1-1/+1
2016-03-21Sync with maintLibravatar Junio C Hamano2-3/+3
2016-03-21Merge branch 'mm/doc-hooks-linkgit-fix' into maintLibravatar Junio C Hamano1-1/+1
2016-03-21Documentation: fix broken linkgit to git-configLibravatar Matthieu Moy1-1/+1
2016-03-21Documentation: use ASCII quotation marks in git-p4Libravatar Lars Schneider1-1/+1
2016-03-21Merge branch 'tb/avoid-gcc-on-darwin-10-6'Libravatar Junio C Hamano1-3/+0
2016-03-21Revert "config.mak.uname: use clang for Mac OS X 10.6"Libravatar Eric Sunshine1-3/+0
2016-03-21Merge branch 'es/st-add4-gcc-4.2-workaround' into maintLibravatar Junio C Hamano1-2/+2
2016-03-21git-compat-util: st_add4: work around gcc 4.2.x compiler crashLibravatar Eric Sunshine1-2/+2
2016-03-20Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano6-82/+283
2016-03-20Merge branch 'master' of git://ozlabs.org/~paulus/gitkLibravatar Junio C Hamano4-804/+788
2016-03-21l10n: vi.po (2530t): Update translationLibravatar Tran Ngoc Quan1-30/+125
2016-03-20l10n: zh_CN: review for git v2.8.0 l10n round 2Libravatar Ray Chen1-5/+5
2016-03-19gitk: Follow themed bgcolor in help dialogsLibravatar Guillermo S. Romero1-4/+4
2016-03-19gitk: fr.po: Sync translations with gitLibravatar Jean-Noel Avila1-50/+46
2016-03-19gitk: Update French translation (311t)Libravatar Jean-Noel Avila1-388/+373
2016-03-19gitk: Update German translationLibravatar Ralf Thielow1-46/+33
2016-03-19gitk: Update Bulgarian translation (311t)Libravatar Alexander Shopov1-320/+336
2016-03-18RelNotes: remove the mention of !reinclusionLibravatar Junio C Hamano1-5/+0
2016-03-18Revert "Merge branch 'nd/exclusion-regression-fix'"Libravatar Junio C Hamano7-378/+12
2016-03-18Revert "Merge branch 'jc/exclusion-doc'"Libravatar Junio C Hamano1-37/+1
2016-03-17Sync with Git 2.7.4Libravatar Junio C Hamano5-3/+50
2016-03-17Git 2.7.4Libravatar Junio C Hamano3-2/+13
2016-03-17l10n: de.po: add missing newlinesLibravatar Ralf Thielow1-2/+3