summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* correct ce_compare_data() in a middle of a mergetb/convert-peek-in-indexTorsten Bögershausen2016-07-0711-49/+90
* read-cache: factor out get_sha1_from_index() helperTorsten Bögershausen2016-07-072-11/+21
* convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-067-59/+69
* convert.c: ident + core.autocrlf didn't worktb/core-eol-fixTorsten Bögershausen2016-04-252-13/+8
* t0027: test cases for combined attributesTorsten Bögershausen2016-04-251-169/+129
* convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-252-7/+3
* t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-251-1/+2
* Git 2.8v2.8.0Junio C Hamano2016-03-283-9/+14
* Merge branch 'ls/p4-doc-markup'Junio C Hamano2016-03-241-6/+4
|\
| * Documentation: fix git-p4 AsciiDoc formattingls/p4-doc-markupLars Schneider2016-03-231-5/+3
| * Documentation: use ASCII quotation marks in git-p4Lars Schneider2016-03-211-1/+1
* | Merge branch 'js/mingw-tests-2.8'Junio C Hamano2016-03-244-11/+19
|\ \
| * | mingw: skip some tests in t9115 due to file name issuesJohannes Schindelin2016-03-231-2/+2
| * | t1300: fix the new --show-origin tests on WindowsJohannes Schindelin2016-03-231-3/+6
| * | t1300-repo-config: make it resilient to being run via 'sh -x'Johannes Schindelin2016-03-231-6/+2
| * | config --show-origin: report paths with forward slashesJohannes Schindelin2016-03-232-0/+9
* | | Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2016-03-242-3/+16
|\ \ \
| * | | submodule: fix regression for deinit without submodulesStefan Beller2016-03-222-3/+16
* | | | Merge branch 'master' of git://github.com/git-l10n/git-poJunio C Hamano2016-03-233-3761/+11533
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-03-231-30/+125
| |\ \ \
| | * | | l10n: vi.po (2530t): Update translationTran Ngoc Quan2016-03-211-30/+125
| * | | | Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin2016-03-231-1365/+1581
| |\ \ \ \
| | * | | | l10n: ca.po: update translationAlex Henrie2016-03-211-1365/+1581
| | |/ / /
| * | | | l10n: pt_PT: Update and add new translationsVasco Almeida2016-03-221-2366/+9827
| |/ / /
* | | | Git 2.8-rc4v2.8.0-rc4Junio C Hamano2016-03-211-1/+1
* | | | Sync with maintJunio C Hamano2016-03-212-3/+3
|\ \ \ \
| * \ \ \ Merge branch 'mm/doc-hooks-linkgit-fix' into maintJunio C Hamano2016-03-211-1/+1
| |\ \ \ \
| | * | | | Documentation: fix broken linkgit to git-configmm/doc-hooks-linkgit-fixMatthieu Moy2016-03-211-1/+1
| * | | | | Merge branch 'es/st-add4-gcc-4.2-workaround' into maintJunio C Hamano2016-03-211-2/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | git-compat-util: st_add4: work around gcc 4.2.x compiler crashes/st-add4-gcc-4.2-workaroundEric Sunshine2016-03-211-2/+2
* | | | | | Merge branch 'tb/avoid-gcc-on-darwin-10-6'Junio C Hamano2016-03-211-3/+0
|\ \ \ \ \ \
| * | | | | | Revert "config.mak.uname: use clang for Mac OS X 10.6"tb/avoid-gcc-on-darwin-10-6Eric Sunshine2016-03-211-3/+0
* | | | | | | Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano2016-03-206-82/+283
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | l10n: zh_CN: review for git v2.8.0 l10n round 2Ray Chen2016-03-201-5/+5
| * | | | | | l10n: de.po: add missing newlinesRalf Thielow2016-03-171-2/+3
| * | | | | | l10n: de.po: translate 22 new messagesRalf Thielow2016-03-171-37/+136
| * | | | | | Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/gitJiang Xin2016-03-171-5/+7
| |\ \ \ \ \ \
| | * | | | | | l10n: fr.po v2.8.0 round 3Jean-Noel Avila2016-03-151-5/+7
| * | | | | | | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2016-03-171-3/+7
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2016-03-161-3/+7
| | |/ / / / / /
| * | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2016-03-171-31/+122
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: sv.po: Update Swedish translation (2530t0f0u)Peter Krefting2016-03-151-31/+122
| | |/ / / / / /
| * | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-151-2/+6
| |/ / / / / /
* | | | | | | Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano2016-03-204-804/+788
|\ \ \ \ \ \ \
| * | | | | | | gitk: Follow themed bgcolor in help dialogsGuillermo S. Romero2016-03-191-4/+4
| * | | | | | | gitk: fr.po: Sync translations with gitJean-Noel Avila2016-03-191-50/+46
| * | | | | | | gitk: Update French translation (311t)Jean-Noel Avila2016-03-191-388/+373
| * | | | | | | gitk: Update German translationRalf Thielow2016-03-191-46/+33
| * | | | | | | gitk: Update Bulgarian translation (311t)Alexander Shopov2016-03-191-320/+336
* | | | | | | | RelNotes: remove the mention of !reinclusionJunio C Hamano2016-03-181-5/+0