summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-04-03Merge branch 'mm/diff-renames-default'Libravatar Junio C Hamano12-46/+131
2016-04-03Merge branch 'mm/readme-markdown'Libravatar Junio C Hamano2-5/+4
2016-04-03Git 2.8.1Libravatar Junio C Hamano4-3/+13
2016-04-03Merge branch 'mm/readme-markdown' into maintLibravatar Junio C Hamano1-1/+1
2016-04-03README.md: don't take 'commandname' literallyLibravatar Matthieu Moy1-4/+3
2016-04-03git.spec.in: use README.md, not READMELibravatar Matthieu Moy1-1/+1
2016-03-30MSVC: use shipped headers instead of fallback definitionsLibravatar Sven Strickroth2-1/+5
2016-03-30MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any moreLibravatar Sven Strickroth1-1/+1
2016-03-29Documentation: git diff --check detects conflict markersLibravatar Ori Avtalion1-2/+2
2016-03-28Git 2.8Libravatar Junio C Hamano3-9/+14
2016-03-25api-parse-options.txt: document OPT_CMDMODE()Libravatar Pranit Bauva1-0/+7
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-24apply: report patch skipping in verbose modeLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2016-03-24git-apply.txt: mention the behavior inside a subdirLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2016-03-24git-apply.txt: remove a spaceLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2016-03-23Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano3-3761/+11533
2016-03-23merge: refuse to create too cool a merge by defaultLibravatar Junio C Hamano12-14/+57
2016-03-23merge: fix NULL pointer dereference when merging nothing into voidLibravatar Junio C Hamano2-5/+15
2016-03-23Documentation: fix git-p4 AsciiDoc formattingLibravatar Lars Schneider1-5/+3
2016-03-23git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERSLibravatar Jeff King2-1/+15
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-22tag: add the option to force signing of annotated tagsLibravatar Laurent Arnoud3-6/+60
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-21commit: do not lose SQUASH_MSG contentsLibravatar Sven Strickroth2-1/+38
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