summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-01-09Merge branch 'js/misc-git-gui-stuff' of ../git-guiLibravatar Junio C Hamano2-1/+27
2018-01-09git-gui: allow Ctrl+T to toggle multiple pathsLibravatar Johannes Schindelin1-0/+13
2018-01-09git-gui: fix exception when trying to stage with empty file listLibravatar Johannes Schindelin1-2/+10
2018-01-09git-gui: avoid exception upon Ctrl+T in an empty listLibravatar Johannes Schindelin1-0/+4
2018-01-09git gui: fix staging a second line to a 1-line fileLibravatar Johannes Schindelin1-0/+1
2018-01-09Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Libravatar Junio C Hamano2-1/+51
2018-01-09merge-recursive: do not look at the index during recursive mergeLibravatar Junio C Hamano2-1/+51
2018-01-09l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-1918/+2092
2018-01-09l10n: TEAMS: Add ko team membersLibravatar Changwoo Ryu1-0/+2
2018-01-09Merge branch 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-koLibravatar Jiang Xin2-1944/+2200
2018-01-08oidset: don't return value from oidset_initLibravatar Thomas Gummerer1-1/+1
2018-01-08stash: don't delete untracked files that match pathspecLibravatar Thomas Gummerer2-3/+34
2018-01-08l10n: ko.po: Update Korean translationLibravatar Changwoo Ryu2-1944/+2200
2018-01-08Merge branch '2.16' of https://github.com/ChrisADR/git-poLibravatar Jiang Xin1-181/+197
2018-01-08Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/gitLibravatar Jiang Xin1-192/+225
2018-01-07l10n: fr.po 2.16 round 2Libravatar Jean-Noel Avila1-192/+225
2018-01-07l10n: es.po: Spanish translation 2.16.0 round 2Libravatar Christopher Díaz Riveros1-181/+197
2018-01-07l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2Libravatar Tran Ngoc Quan1-1929/+2156
2018-01-07l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)Libravatar Jiang Xin1-173/+192
2018-01-07Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin8-10292/+11238
2018-01-06Merge branch '2.16' of https://github.com/ChrisADR/git-poLibravatar Jiang Xin1-1920/+2129
2018-01-06Merge branch 'fr_2.16' of git://github.com/jnavila/gitLibravatar Jiang Xin1-1911/+2113
2018-01-05Git 2.16-rc1Libravatar Junio C Hamano2-1/+12
2018-01-05Merge branch 'js/sequencer-cleanups'Libravatar Junio C Hamano2-13/+20
2018-01-05Merge branch 'jh/memihash-opt'Libravatar Junio C Hamano1-1/+1
2018-01-05Merge branch 'tb/test-lint-wc-l'Libravatar Junio C Hamano1-0/+1
2018-01-05Merge branch 'rs/use-argv-array-in-child-process'Libravatar Junio C Hamano2-27/+12
2018-01-05Merge branch 'ld/p4-multiple-shelves'Libravatar Junio C Hamano3-26/+47
2018-01-05Merge branch 'jd/fix-strbuf-add-urlencode-bytes'Libravatar Junio C Hamano1-1/+1
2018-01-05Merge branch 'ew/empty-merge-with-dirty-index'Libravatar Junio C Hamano5-42/+70
2018-01-05Merge branch 'db/doc-config-section-names-with-bs'Libravatar Junio C Hamano1-5/+7
2018-01-05Merge branch 'jk/test-suite-tracing'Libravatar Junio C Hamano4-18/+48
2018-01-05submodule: submodule_move_head omits old argument in forced caseLibravatar Stefan Beller2-1/+17
2018-01-05unpack-trees: oneway_merge to update submodulesLibravatar Stefan Beller1-0/+3
2018-01-05t/lib-submodule-update.sh: fix test ignoring ignored files in submodulesLibravatar Stefan Beller1-0/+1
2018-01-05t/lib-submodule-update.sh: clarify testLibravatar Stefan Beller1-2/+2
2018-01-05perf/run: read GIT_PERF_REPO_NAME from perf.repoNameLibravatar Christian Couder1-0/+3
2018-01-05perf/run: learn to send output to codespeed serverLibravatar Christian Couder1-1/+11
2018-01-05perf/run: learn about perf.codespeedOutputLibravatar Christian Couder1-1/+6
2018-01-05perf/run: add conf_opts argument to get_var_from_env_or_config()Libravatar Christian Couder1-5/+6
2018-01-05perf/aggregate: implement codespeed JSON outputLibravatar Christian Couder1-2/+62
2018-01-05perf/aggregate: refactor printing resultsLibravatar Christian Couder1-46/+50
2018-01-05perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}Libravatar Christian Couder1-1/+1
2018-01-05rebase -p: fix quoting when calling `git merge`Libravatar Johannes Schindelin2-3/+20
2018-01-04diff: use HAS_MULTI_BITS instead of counting bits manuallyLibravatar Stefan Beller1-10/+5
2018-01-04diff: properly error out when combining multiple pickaxe optionsLibravatar Stefan Beller2-1/+3
2018-01-04diffcore: add a pickaxe option to find a specific blobLibravatar Stefan Beller6-20/+135
2018-01-04diff: introduce DIFF_PICKAXE_KINDS_MASKLibravatar Stefan Beller5-6/+8
2018-01-04diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bitLibravatar Stefan Beller3-5/+6
2018-01-04diff.h: make pickaxe_opts an unsigned bit fieldLibravatar Stefan Beller1-1/+1