summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff: document the format of the -O (diff.orderFile) filerh/diff-orderfile-docRichard Hansen2017-01-152-5/+34
* diff: document behavior of relative diff.orderFileRichard Hansen2017-01-151-0/+2
* Sync with maint-2.10Junio C Hamano2016-12-051-0/+48
|\
| * preparing for 2.10.3Junio C Hamano2016-12-052-1/+49
| * Merge branch 'jk/common-main' into maint-2.10Junio C Hamano2016-12-055-11/+12
| |\
| * \ Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano2016-11-295-8/+1
| |\ \
| * \ \ Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-294-13/+18
| |\ \ \
| * \ \ \ Merge branch 'nd/worktree-lock' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ps/common-info-doc' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-11-291-0/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-11-292-3/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maintJunio C Hamano2016-11-291-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-291-8/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-config-insn-fmt-docfix' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/pre-receive-hook-template-modefix' into maintJunio C Hamano2016-11-291-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/macos-update' into maintJunio C Hamano2016-11-292-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/merge-attr-sleep' into maintJunio C Hamano2016-11-291-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maintJunio C Hamano2016-11-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-path-ok-check-truncation' into maintJunio C Hamano2016-11-291-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/ring-buffer-wraparound' into maintJunio C Hamano2016-11-292-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/send-email-cc-cruft-after-address' into maintJunio C Hamano2016-11-293-10/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cp/completion-negative-refs' into maintJunio C Hamano2016-11-291-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-read-author-file' into maintJunio C Hamano2016-11-291-58/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | Git 2.11v2.11.0Junio C Hamano2016-11-292-1/+6
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/common-main'Junio C Hamano2016-11-294-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | common-main: stop munging argv[0] pathjk/common-mainJeff King2016-11-294-9/+10
* | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-292-4189/+5888
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-11-291-2066/+2868
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-11-291-2066/+2868
| * | | | | | | | | | | | | | | | | | | | | | l10n: ca.po: update translationAlex Henrie2016-11-281-2123/+3020
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | RelNotes: spelling and phrasing fixupsMarc Branchaud2016-11-281-76/+72
* | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-288-2193/+3167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | l10n: de.po: translate 210 new messagesRalf Thielow2016-11-281-2111/+3085
| * | | | | | | | | | | | | | | | | | | | | l10n: fix unmatched single quote in error messageJiang Xin2016-11-257-82/+82
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Git 2.11-rc3v2.11.0-rc3Junio C Hamano2016-11-232-1/+10
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-238-20/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | archive: read local configurationjc/setup-cleanup-fixJunio C Hamano2016-11-226-15/+40
| * | | | | | | | | | | | | | | | | | | | | mailinfo: read local configurationJunio C Hamano2016-11-223-5/+29
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/trailer-with-cruft'Junio C Hamano2016-11-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | doc: mention user-configured trailersjt/trailer-with-cruftJonathan Tan2016-11-211-1/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-234-3/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | rebase -i: handle core.commentChar=autojs/rebase-i-commentchar-fixJohannes Schindelin2016-11-212-3/+12
| * | | | | | | | | | | | | | | | | | | | | | | stripspace: respect repository configJohannes Schindelin2016-11-212-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | rebase -i: highlight problems with core.commentcharJohannes Schindelin2016-11-212-0/+20
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/for-each-ref-head-segfault-fix'Junio C Hamano2016-11-232-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | for-each-ref: do not segv with %(HEAD) on an unborn branchjc/for-each-ref-head-segfault-fixJunio C Hamano2016-11-182-1/+11
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-228-16103/+23112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | l10n: Fixed typo of git fetch-pack commandJiang Xin2016-11-226-183/+282
| * | | | | | | | | | | | | | | | | | | | | | | | l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)Jiang Xin2016-11-221-9/+9
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-11-228-16066/+22976
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |