summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* am: refactor read_author_script()jc/am-read-author-fileJunio C Hamano2016-08-301-58/+45
* Git 2.10-rc2v2.10.0-rc2Junio C Hamano2016-08-262-1/+4
* gitattributes: Document the unified "auto" handlingTorsten Bögershausen2016-08-261-34/+24
* Prepare for 2.10.0-rc2Junio C Hamano2016-08-251-2/+29
* Merge branch 'ja/i18n'Junio C Hamano2016-08-253-71/+20
|\
| * i18n: simplify numeric error reportingja/i18nJean-Noel Avila2016-08-241-28/+16
| * i18n: fix git rebase interactive commit messagesJean-Noel Avila2016-08-241-42/+3
| * i18n: fix typos for translationJean-Noel Avila2016-08-241-1/+1
* | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'Junio C Hamano2016-08-256-1/+35
|\ \
| * | mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfileBen Wijen2016-08-236-2/+23
| * | t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen2016-08-181-0/+13
* | | Merge branch 'dg/document-git-c-in-git-config-doc'Junio C Hamano2016-08-251-0/+3
|\ \ \
| * | | doc: mention `git -c` in git-config(1)dg/document-git-c-in-git-config-docDavid Glasser2016-08-231-0/+3
* | | | Merge branch 'js/no-html-bypass-on-windows'Junio C Hamano2016-08-253-52/+0
|\ \ \ \
| * | | | Revert "display HTML in default browser using Windows' shell API"js/no-html-bypass-on-windowsJohannes Schindelin2016-08-193-52/+0
| |/ / /
* | | | Merge branch 'hv/doc-commit-reference-style'Junio C Hamano2016-08-251-0/+5
|\ \ \ \
| * | | | SubmittingPatches: document how to reference previous commitsHeiko Voigt2016-08-171-0/+5
| |/ / /
* | | | git ls-files: text=auto eol=lf is supported in Git 2.10Torsten Bögershausen2016-08-251-2/+1
| |_|/ |/| |
* | | Git 2.10-rc1v2.10.0-rc1Junio C Hamano2016-08-192-1/+32
* | | Merge branch 'lt/gpg-show-long-key-in-signature-verification'Junio C Hamano2016-08-191-0/+1
|\ \ \
| * \ \ Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/g...lt/gpg-show-long-key-in-signature-verificationJunio C Hamano2016-08-161-0/+1
| |\ \ \
| | * | | gpg-interface: prefer "long" key format output when verifying pgp signatureslt/gpg-show-long-key-in-signature-verification-maintLinus Torvalds2016-08-161-2/+2
| | |/ /
* | | | Merge branch 'ab/hooks'Junio C Hamano2016-08-193-4/+9
|\ \ \ \
| * | | | rev-parse: respect core.hooksPath in --git-pathab/hooksJohannes Schindelin2016-08-163-4/+9
* | | | | Merge branch 'jk/difftool-command-not-found'Junio C Hamano2016-08-192-0/+13
|\ \ \ \ \
| * | | | | difftool: always honor fatal error exit codesjk/difftool-command-not-foundJohn Keeping2016-08-152-0/+13
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-192-1/+25
|\ \ \ \ \
| * | | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-152-1/+25
| |/ / / /
* | | | | Merge branch 'tb/t0027-raciness-fix'Junio C Hamano2016-08-192-43/+60
|\ \ \ \ \
| * | | | | convert: Correct NNO tests and missing `LF will be replaced by CRLF`tb/t0027-raciness-fixTorsten Bögershausen2016-08-142-43/+60
* | | | | | Merge branch 'rs/pull-signed-tag'Junio C Hamano2016-08-194-12/+33
|\ \ \ \ \ \
| * | | | | | commit: use FLEX_ARRAY in struct merge_remote_descrs/pull-signed-tagRené Scharfe2016-08-132-3/+2
| * | | | | | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-132-4/+19
| * | | | | | commit: factor out set_merge_remote_desc()René Scharfe2016-08-132-7/+14
| * | | | | | commit: use xstrdup() in get_merge_parent()René Scharfe2016-08-131-1/+1
| | |/ / / / | |/| | | |
* | | | | | RelNotes: final batch of topics before -rc1Junio C Hamano2016-08-171-0/+13
* | | | | | Merge branch 'js/test-lint-pathname'Junio C Hamano2016-08-171-1/+10
|\ \ \ \ \ \
| * | | | | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathnameJohannes Schindelin2016-08-161-1/+10
| |/ / / / /
* | | | | | Merge branch 'sg/reflog-past-root'Junio C Hamano2016-08-171-1/+0
|\ \ \ \ \ \
| * | | | | | t1410: remove superfluous 'git reflog' from the 'walk past root' testsg/reflog-past-rootSZEDER Gábor2016-08-151-1/+0
* | | | | | | Merge branch 'rs/mailinfo-lib'Junio C Hamano2016-08-171-7/+2
|\ \ \ \ \ \ \
| * | | | | | | mailinfo: recycle strbuf in check_header()rs/mailinfo-libRené Scharfe2016-08-131-7/+2
* | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-08-172-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | receive-pack: use FLEX_ALLOC_MEM in queue_command()René Scharfe2016-08-131-3/+1
| * | | | | | | | correct FLEXPTR_* example in commentRené Scharfe2016-08-131-1/+1
* | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-08-173-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7411: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-1/+1
| * | | | | | | | | t5520: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-2/+2
| * | | | | | | | | t3404: become resilient to GETTEXT_POISONVasco Almeida2016-08-121-1/+1
* | | | | | | | | | git-multimail: update to release 1.4.0Matthieu Moy2016-08-176-276/+725