summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase (interactive-backend): make --keep-empty the defaultElijah Newren2020-02-169-55/+126
* t3404: directly test the behavior of interestElijah Newren2020-01-171-3/+4
* git-rebase.txt: update description of --allow-empty-messageElijah Newren2020-01-172-8/+11
* Git 2.25v2.25.0Junio C Hamano2020-01-131-1/+1
* Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-poJunio C Hamano2020-01-1212-24312/+53740
|\
| * l10n: zh_CN: for git v2.25.0 l10n round 1Jiang Xin2020-01-121-2275/+2807
| * Merge branch 'master' of github.com:Softcatala/git-po into git-po-masterJiang Xin2020-01-111-3757/+4260
| |\
| | * l10n: Update Catalan translationJordi Mas2020-01-101-3757/+4260
| * | l10n: de.po: Update German translation v2.25.0 round 1Matthias Rüster2020-01-101-2282/+2844
| * | l10n: de.po: Reword generation numbersThomas Braun2020-01-101-1/+1
| * | l10n: bg.po: Updated Bulgarian translation (4800t)Alexander Shopov2020-01-091-2353/+2905
| |/
| * l10n: es: 2.25.0 round #1Christopher Diaz Riveros2020-01-061-2282/+2838
| * l10n: sv.po: Update Swedish translation (4800t0f0u)Peter Krefting2020-01-041-2282/+2825
| * Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into masterJiang Xin2020-01-041-2271/+2800
| |\
| | * l10n: fr.po v2.25.0 rnd 1Jean-Noël Avila2020-01-031-2271/+2800
| * | l10n: vi(4800t): Updated Vietnamese translation v2.25.0Tran Ngoc Quan2020-01-031-2273/+2839
| * | Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-ma...Jiang Xin2020-01-011-2343/+2974
| |\ \
| | * | l10n: zh_TW.po: update translation for v2.25.0 round 1pan934122019-12-311-2343/+2974
| | |/
| * | l10n: it.po: update the Italian translation for Git 2.25.0Alessandro Menti2019-12-301-2277/+2854
| |/
| * l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed)Jiang Xin2019-12-301-2252/+2755
| * Merge tag 'v2.25.0-rc0' into git-po-masterJiang Xin2019-12-30518-6607/+17382
| |\
| * | l10n: Update Catalan translationJordi Mas2019-12-271-8/+8
| * | l10n: zh_TW: add translation for v2.24.0Yi-Jyun Pan2019-11-252-0/+23374
* | | Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano2020-01-127-327/+28
* | | Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'Junio C Hamano2020-01-102-7/+7
|\ \ \
| * | | mingw: safeguard better against backslashes in file namesJohannes Schindelin via GitGitGadget2020-01-102-7/+7
* | | | Merge branch 'ma/config-advice-markup-fix'Junio C Hamano2020-01-101-1/+1
|\ \ \ \
| * | | | config/advice.txt: fix description list separatorMartin Ågren2020-01-081-1/+1
* | | | | Git 2.25-rc2v2.25.0-rc2Junio C Hamano2020-01-082-1/+5
* | | | | Merge branch 'ds/graph-assert-fix'Junio C Hamano2020-01-082-8/+80
|\ \ \ \ \
| * | | | | graph: fix lack of color in horizontal linesDerrick Stolee2020-01-082-4/+38
| * | | | | graph: drop assert() for merge with two collapsing parentsDerrick Stolee2020-01-082-4/+42
* | | | | | Merge branch 'tm/doc-submodule-absorb-fix'Junio C Hamano2020-01-081-1/+1
|\ \ \ \ \ \
| * | | | | | doc: submodule: fix typo for command absorbgitdirsThomas Menzel2020-01-061-1/+1
* | | | | | | Merge branch 'pm/am-in-body-header-doc-update'Junio C Hamano2020-01-081-2/+2
|\ \ \ \ \ \ \
| * | | | | | | am: document that Date: can appear as an in-body headerPaul Menzel2020-01-041-2/+2
* | | | | | | | Merge branch 'jb/doc-multi-pack-idx-fix'Junio C Hamano2020-01-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | multi-pack-index: correct configuration in documentationJohannes Berg2020-01-041-1/+1
* | | | | | | | | Merge branch 'do/gitweb-typofix-in-comments'Junio C Hamano2020-01-081-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: fix a couple spelling errors in commentsDenis Ovsienko2020-01-041-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-01-0810-232/+920
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'zs/open-current-file'Pratyush Yadav2020-01-051-5/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | git-gui: allow opening currently selected file in default appZoli Szabó2019-12-311-5/+24
| |/ / / / / / / /
| * | | | | | | | Merge branch 'py/console-close-esc'Pratyush Yadav2019-12-201-0/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | git-gui: allow closing console window with EscapePratyush Yadav2019-12-191-0/+2
| * | | | | | | | | Merge branch 'kk/branch-name-encoding'Pratyush Yadav2019-12-112-0/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | git gui: fix branch name encoding errorKazuhiro Kato2019-12-102-0/+3
| |/ / / / / / / /
| * | | | | | | | Merge branch 'jg/revert-untracked'Pratyush Yadav2019-12-068-227/+891
| |\ \ \ \ \ \ \ \
| | * | | | | | | | git-gui: revert untracked files by deleting themJonathan Gilbert2019-12-063-84/+502
| | * | | | | | | | git-gui: update status bar to track operationsJonathan Gilbert2019-12-067-108/+354