summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Git 2.30-rc1v2.30.0-rc1Junio C Hamano2020-12-192-1/+5
* Merge branch 'jc/diff-I-status-fix'Junio C Hamano2020-12-192-1/+26
|\
| * diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano2020-12-172-1/+26
* | Merge branch 'es/perf-export-fix'Junio C Hamano2020-12-191-2/+7
|\ \
| * | t/perf: fix test_export() failure with BSD `sed`Eric Sunshine2020-12-161-2/+7
* | | Merge branch 'rb/nonstop-config-mak-uname-update'Junio C Hamano2020-12-191-4/+0
|\ \ \
| * | | config.mak.uname: remove old NonStop compatibility settingsRandall S. Becker2020-12-171-4/+0
| |/ /
* | | Merge branch 'ab/unreachable-break'Junio C Hamano2020-12-192-3/+0
|\ \ \
| * | | style: do not "break" in switch() after "return"Ævar Arnfjörð Bjarmason2020-12-162-3/+0
| |/ /
* | | Merge branch 'jc/strmap-remove-typefix'Junio C Hamano2020-12-191-2/+2
|\ \ \
| * | | strmap: make callers of strmap_remove() to call it in void contextJunio C Hamano2020-12-161-2/+2
* | | | Merge branch 'jc/compat-util-setitimer-fix'Junio C Hamano2020-12-191-1/+1
|\ \ \ \
| * | | | compat-util: pretend that stub setitimer() always succeedsJunio C Hamano2020-12-161-1/+1
* | | | | Merge branch 'dd/doc-p4-requirements-update'Junio C Hamano2020-12-192-3/+2
|\ \ \ \ \
| * | | | | doc: mention Python 3.x supportsĐoàn Trần Công Danh2020-12-152-3/+2
* | | | | | Merge branch 'js/init-defaultbranch-advice'Junio C Hamano2020-12-1910-20/+61
|\ \ \ \ \ \
| * | | | | | init: provide useful advice about init.defaultBranchJohannes Schindelin2020-12-144-4/+29
| * | | | | | get_default_branch_name(): prepare for showing some adviceJohannes Schindelin2020-12-145-11/+14
| * | | | | | branch -m: allow renaming a yet-unborn branchJohannes Schindelin2020-12-142-1/+11
| * | | | | | init: document `init.defaultBranch` betterJohannes Schindelin2020-12-141-4/+7
* | | | | | | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-12-196-1397/+1711
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sh/inactive-background'Pratyush Yadav2020-12-182-16/+37
| |\ \ \ \ \ \ \
| | * | | | | | | git-gui: use gray background for inactive text widgetsStefan Haller2020-12-182-16/+37
| |/ / / / / / /
| * | | | | | | Merge branch 'st/selected-text-colors'Pratyush Yadav2020-12-171-2/+4
| |\ \ \ \ \ \ \
| | * | | | | | | git-gui: Fix selected text colorsSerg Tereshchenko2020-12-171-2/+4
| |/ / / / / / /
| * | | | | | | Merge branch 'rj/clean-speedup'Pratyush Yadav2020-12-171-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Makefile: conditionally include GIT-VERSION-FILERamsay Jones2020-12-171-0/+2
| |/ / / / / / /
| * | | | | | | Merge branch 'sh/macos-labels'Pratyush Yadav2020-12-171-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | git-gui: fix colored label backgrounds when using themed widgetsStefan Haller2020-12-171-2/+2
| |/ / / / / / /
| * | | | | | | Merge branch 'da/askpass-mask-checkbox'Pratyush Yadav2020-12-011-1/+14
| |\ \ \ \ \ \ \
| | * | | | | | | git-gui: ssh-askpass: add a checkbox to show the input textDavid Aguilar2020-12-011-1/+14
| |/ / / / / / /
| * | | | | | | Merge branch 'dr/russian-translation'Pratyush Yadav2020-12-011-1375/+1644
| |\ \ \ \ \ \ \
| | * | | | | | | git-gui: update Russian translationDimitriy Ryazantcev2020-12-011-1375/+1644
| |/ / / / / / /
| * | | | | | | Merge branch 'ms/commit-template'Pratyush Yadav2020-12-012-3/+10
| |\ \ \ \ \ \ \
| | * | | | | | | git-gui: use commit message templateMartin Schön2020-11-272-0/+8
| | * | | | | | | git-gui: Only touch GITGUI_MSG when neededPratyush Yadav2020-11-271-3/+2
| |/ / / / / / /
* | | | | | | | Another batch before 2.30-rc1Junio C Hamano2020-12-181-0/+2
* | | | | | | | Merge branch 'jh/index-v2-doc-on-fsmn'Junio C Hamano2020-12-181-2/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | index-format.txt: document v2 format of file system monitor extensionJeff Hostetler2020-12-141-2/+8
* | | | | | | | | Merge branch 'jb/midx-doc-update'Junio C Hamano2020-12-181-4/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docs: multi-pack-index: remove note about future 'verify' workJohannes Berg2020-12-141-4/+0
* | | | | | | | | | Merge branch 'rj/make-clean'Junio C Hamano2020-12-183-8/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Makefile: don't use a versioned temp distribution directoryRamsay Jones2020-12-091-7/+8
| * | | | | | | | | | Makefile: don't try to clean old debian build productRamsay Jones2020-12-091-1/+1
| * | | | | | | | | | gitweb/Makefile: conditionally include ../GIT-VERSION-FILERamsay Jones2020-12-091-0/+2
| * | | | | | | | | | Documentation/Makefile: conditionally include ../GIT-VERSION-FILERamsay Jones2020-12-091-0/+2
| * | | | | | | | | | Documentation/Makefile: conditionally include doc.depRamsay Jones2020-12-091-0/+2
* | | | | | | | | | | Merge branch 'js/t7064-master-to-initial'Junio C Hamano2020-12-181-51/+52
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t7064: avoid relying on a specific default branch nameJohannes Schindelin2020-12-081-51/+52
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'js/t6300-hardcode-main'Junio C Hamano2020-12-181-88/+90
|\ \ \ \ \ \ \ \ \ \ \