aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'bb/unicode-9.0' into maintJunio C Hamano2017-01-17
|\
| * unicode_width.h: update the width tables to Unicode 9.0Beat Bolli2016-12-14
| * update_unicode.sh: remove the plane filterBeat Bolli2016-12-14
| * update_unicode.sh: automatically download newer definition filesBeat Bolli2016-12-14
| * update_unicode.sh: pin the uniset repo to a known good commitBeat Bolli2016-12-13
| * update_unicode.sh: remove an unnecessary subshell levelBeat Bolli2016-12-13
| * update_unicode.sh: move it into contrib/update-unicodeBeat Bolli2016-12-13
* | Merge branch 'ls/travis-update-p4-and-lfs' into maintJunio C Hamano2017-01-17
|\ \
| * | travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux buildLars Schneider2016-12-05
* | | Sync with maint-2.10Junio C Hamano2016-12-05
|\ \ \ | |/ / |/| |
| * | preparing for 2.10.3Junio C Hamano2016-12-05
| * | Merge branch 'jk/common-main' into maint-2.10Junio C Hamano2016-12-05
| |\ \
| * \ \ Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano2016-11-29
| |\ \ \
| * \ \ \ Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-29
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/worktree-lock' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ps/common-info-doc' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-config-insn-fmt-docfix' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/pre-receive-hook-template-modefix' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/macos-update' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/merge-attr-sleep' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-path-ok-check-truncation' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/ring-buffer-wraparound' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/send-email-cc-cruft-after-address' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cp/completion-negative-refs' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-read-author-file' into maintJunio C Hamano2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Git 2.11v2.11.0Junio C Hamano2016-11-29
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/common-main'Junio C Hamano2016-11-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | common-main: stop munging argv[0] pathJeff King2016-11-29
* | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-11-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-11-29
| * | | | | | | | | | | | | | | | | | | | | | | l10n: ca.po: update translationAlex Henrie2016-11-28
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | RelNotes: spelling and phrasing fixupsMarc Branchaud2016-11-28
* | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 210 new messagesRalf Thielow2016-11-28
| * | | | | | | | | | | | | | | | | | | | | | l10n: fix unmatched single quote in error messageJiang Xin2016-11-25
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Git 2.11-rc3v2.11.0-rc3Junio C Hamano2016-11-23
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | archive: read local configurationJunio C Hamano2016-11-22
| * | | | | | | | | | | | | | | | | | | | | | mailinfo: read local configurationJunio C Hamano2016-11-22
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/trailer-with-cruft'Junio C Hamano2016-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | doc: mention user-configured trailersJonathan Tan2016-11-21
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | rebase -i: handle core.commentChar=autoJohannes Schindelin2016-11-21
| * | | | | | | | | | | | | | | | | | | | | | | | stripspace: respect repository configJohannes Schindelin2016-11-21