summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mingw: make stderr unbuffered againjs/mingw-isattyJohannes Schindelin2017-02-141-0/+4
* mingw: follow-up to "replace isatty() hack"Johannes Schindelin2017-01-181-7/+4
* mingw: replace isatty() hackJeff Hostetler2016-12-221-107/+69
* mingw: fix colourization on Cygwin pseudo terminalsAlan Davies2016-12-221-2/+6
* mingw: adjust is_console() to work with stdinJohannes Schindelin2016-12-221-1/+5
* mingw: intercept isatty() to handle /dev/null as Git expects itJohannes Schindelin2016-12-112-0/+36
* 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
|\
| * common-main: stop munging argv[0] pathjk/common-mainJeff King2016-11-294-9/+10
| * git-compat-util: move content inside ifdef/endif guardsJeff King2016-10-271-2/+2
* | Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano2016-11-295-8/+1
|\ \
| * | diffcore-delta: remove unused parameter to diffcore_count_changes()tk/diffcore-delta-remove-unusedTobias Klauser2016-11-145-8/+1
* | | Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-294-13/+18
|\ \ \
| * | | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-094-13/+18
* | | | Merge branch 'nd/worktree-lock' into maintJunio C Hamano2016-11-291-1/+1
|\ \ \ \
| * | | | git-worktree.txt: fix typo "to"/"two", and add command/worktree-lockBen North2016-11-131-1/+1
* | | | | Merge branch 'ps/common-info-doc' into maintJunio C Hamano2016-11-291-1/+1
|\ \ \ \ \
| * | | | | doc: fix location of 'info/' with $GIT_COMMON_DIRps/common-info-docPatrick Steinhardt2016-11-111-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/cocci' into maintJunio C Hamano2016-11-291-0/+15
|\ \ \ \ \
| * | | | | cocci: avoid self-references in object_id transformationsrs/cocciRené Scharfe2016-11-011-0/+15
* | | | | | Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-11-292-3/+18
|\ \ \ \ \ \
| * | | | | | valgrind: support test helpersnd/test-helpersRené Scharfe2016-10-272-3/+18
* | | | | | | Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maintJunio C Hamano2016-11-291-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Documentation/fmt-merge-msg: fix markup in examplesc/fmt-merge-msg-doc-markup-fixStefan Christ2016-10-281-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-291-8/+6
|\ \ \ \ \ \ \
| * | | | | | | commit: simplify building parents listrs/commit-pptr-simplifyRené Scharfe2016-10-301-8/+6
| |/ / / / / /
* | | | | | | Merge branch 'jk/rebase-config-insn-fmt-docfix' into maintJunio C Hamano2016-11-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | doc: fix missing "::" in config listjk/rebase-config-insn-fmt-docfixJeff King2016-10-301-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'ak/pre-receive-hook-template-modefix' into maintJunio C Hamano2016-11-291-0/+0
|\ \ \ \ \ \ \
| * | | | | | | pre-receive.sample: mark it executableak/pre-receive-hook-template-modefixAnders Kaseorg2016-10-281-0/+0
* | | | | | | | Merge branch 'ls/macos-update' into maintJunio C Hamano2016-11-292-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | travis-ci: disable GIT_TEST_HTTPD for macOSls/macos-updateLars Schneider2016-11-101-1/+2
| * | | | | | | | Makefile: set NO_OPENSSL on macOS by defaultLars Schneider2016-11-101-0/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'as/merge-attr-sleep' into maintJunio C Hamano2016-11-291-5/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | t6026: clarify the point of "kill $(cat sleep.pid)"as/merge-attr-sleepJohannes Sixt2016-11-111-1/+9
| * | | | | | | | t6026: ensure that long-running script really isJohannes Schindelin2016-11-101-4/+4
| * | | | | | | | Revert "t6026-merge-attr: don't fail if sleep exits early"Junio C Hamano2016-11-101-1/+1
| * | | | | | | | Revert "t6026-merge-attr: ensure that the merge driver was called"Junio C Hamano2016-11-101-2/+1
| * | | | | | | | t6026-merge-attr: ensure that the merge driver was calledAndreas Schwab2016-11-101-1/+2
| * | | | | | | | t6026-merge-attr: don't fail if sleep exits earlyAndreas Schwab2016-11-081-1/+1
* | | | | | | | | Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maintJunio C Hamano2016-11-291-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-sh-setup: be explicit where to dot-source git-sh-i18n from.ak/sh-setup-dot-source-i18n-fixAnders Kaseorg2016-10-301-3/+3
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/daemon-path-ok-check-truncation' into maintJunio C Hamano2016-11-291-4/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | daemon: detect and reject too-long pathsjk/daemon-path-ok-check-truncationJeff King2016-10-241-4/+21
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/ring-buffer-wraparound' into maintJunio C Hamano2016-11-292-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hex: make wraparound of the index into ring-buffer explicitrs/ring-buffer-wraparoundRené Scharfe2016-10-262-2/+4
* | | | | | | | | | Merge branch 'mm/send-email-cc-cruft-after-address' into maintJunio C Hamano2016-11-293-10/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git.pm: add comment pointing to t9000mm/send-email-cc-cruft-after-addressMatthieu Moy2016-10-211-0/+2
| * | | | | | | | | | t9000-addresses: update expected results after fixMatthieu Moy2016-10-211-4/+4
| * | | | | | | | | | parse_mailboxes: accept extra text after <...> addressMatthieu Moy2016-10-142-6/+36