summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | git-gui: fix error popup when doing blame -> "Show History Context"Pratyush Yadav2020-03-031-4/+6
| |/ / / / / /
| * | | | | | Merge branch 'py/missing-bracket'Pratyush Yadav2020-02-181-1/+1
| |\ \ \ \ \ \
| | * | | | | | git-gui: add missing close bracketPratyush Yadav2020-02-171-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'cs/german-translation'Pratyush Yadav2020-02-175-2753/+3807
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | git-gui: update German translationChristian Stimming2020-02-172-385/+602
| | * | | | | git-gui: extend translation glossary template with more termsChristian Stimming2020-02-172-46/+305
| | * | | | | git-gui: update pot template and German translation to current source codeChristian Stimming2020-02-172-2533/+3111
| |/ / / / /
* | | | | | RelNotes/2.26.0: fix various typosElijah Newren2020-03-181-4/+4
* | | | | | Sync with Git 2.25.2Junio C Hamano2020-03-173-40/+88
|\ \ \ \ \ \
| * | | | | | Git 2.25.2v2.25.2Junio C Hamano2020-03-173-2/+62
| * | | | | | unicode: update the width tables to Unicode 13.0Beat Bolli2020-03-171-16/+27
| * | | | | | Merge branch 'js/ci-windows-update' into maintJunio C Hamano2020-03-1710-73/+93
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/run-command-formatfix' into maintJunio C Hamano2020-03-171-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/doc-credential-helper' into maintJunio C Hamano2020-03-172-91/+88
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/mingw-open-in-gdb' into maintJunio C Hamano2020-03-172-0/+23
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/test-unc-fetch' into maintJunio C Hamano2020-03-171-0/+12
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/test-write-junit-xml-fix' into maintJunio C Hamano2020-03-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'en/simplify-check-updates-in-unpack-trees' into maintJunio C Hamano2020-03-171-12/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-single-h-is-for-help' into maintJunio C Hamano2020-03-172-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hd/show-one-mergetag-fix' into maintJunio C Hamano2020-03-172-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'am/mingw-poll-fix' into maintJunio C Hamano2020-03-171-28/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hi/gpg-use-check-signature' into maintJunio C Hamano2020-03-174-72/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ds/partial-clone-fixes' into maintJunio C Hamano2020-03-172-5/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'en/t3433-rebase-stat-dirty-failure' into maintJunio C Hamano2020-03-172-2/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'en/check-ignore' into maintJunio C Hamano2020-03-173-19/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-option-doc-markup-fix' into maintJunio C Hamano2020-03-171-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/doc-diff-parallel' into maintJunio C Hamano2020-03-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/notes-fanout-fix' into maintJunio C Hamano2020-03-172-33/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-dupfix' into maintJunio C Hamano2020-03-172-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/rebase-i-with-colliding-hash' into maintJunio C Hamano2020-03-173-9/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/clang-sanitizer-fixes' into maintJunio C Hamano2020-03-175-15/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/submodule-rm-with-stale-cache' into maintJunio C Hamano2020-03-172-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/recurse-submodule-in-worktree-fix' into maintJunio C Hamano2020-03-173-80/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/outside-repo-errmsg-hints' into maintJunio C Hamano2020-03-173-4/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/builtin-add-i-cmds' into maintJunio C Hamano2020-03-172-3/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.26-rc2v2.26.0-rc2Junio C Hamano2020-03-162-5/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'en/test-cleanup'Junio C Hamano2020-03-162-23/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6022, t6046: fix flaky files-are-updated checksElijah Newren2020-03-132-23/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/outside-repo-errmsg-hints'Junio C Hamano2020-03-163-4/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefix_path: show gitdir if worktree unavailableEmily Shaffer2020-03-153-4/+50
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully the final batch before -rc2Junio C Hamano2020-03-121-0/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'en/rebase-backend'Junio C Hamano2020-03-124-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-rebase.txt: highlight backend differences with commit rewordingElijah Newren2020-03-111-0/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: clear state upon dropping a become-empty commitElijah Newren2020-03-112-0/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n: unmark a message in rebase.cJiang Xin2020-03-111-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ds/sparse-add'Junio C Hamano2020-03-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1091: don't grep for `strerror()` stringMartin Ă…gren2020-03-091-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dr/push-remote-ref-update'Junio C Hamano2020-03-113-15/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote: drop "explicit" parameter from remote_ref_for_branch()Jeff King2020-03-033-15/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-single-h-is-for-help'Junio C Hamano2020-03-112-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |