summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* checkout: don't write merge results into the object databasers/checkout-merged-pretendRené Scharfe2017-06-151-3/+3
* Prepare for 2.13.2cc/subprocess-comment-fixJunio C Hamano2017-06-132-1/+38
* Merge branch 'ad/pull-remote-doc' into maintJunio C Hamano2017-06-131-3/+3
|\
| * docs: fix formatting and grammarad/pull-remote-docAdam Dinwoodie2017-06-021-3/+3
* | Merge branch 'jk/drop-free-refspecs' into maintJunio C Hamano2017-06-131-22/+6
|\ \
| * | remote: drop free_refspecs() functionjk/drop-free-refspecsJeff King2017-06-011-22/+6
| |/
* | Merge branch 'jk/connect-symref-info-leak-fix' into maintJunio C Hamano2017-06-131-1/+1
|\ \
| * | connect.c: fix leak in parse_one_symref_info()jk/connect-symref-info-leak-fixJeff King2017-05-261-1/+1
* | | Merge branch 'rf/completion-config-commit' into maintJunio C Hamano2017-06-131-0/+3
|\ \ \
| * | | completion: add completions for git config commitrf/completion-config-commitRikard Falkeborn2017-05-301-0/+3
| | |/ | |/|
* | | Merge branch 'ab/t3070-test-dedup' into maintJunio C Hamano2017-06-131-1/+0
|\ \ \
| * | | wildmatch test: remove redundant duplicate testab/t3070-test-dedupÆvar Arnfjörð Bjarmason2017-05-291-1/+0
* | | | Merge branch 'jh/memihash-opt' into maintJunio C Hamano2017-06-131-5/+42
|\ \ \ \
| * | | | p0004: don't error out if test repo is too smallRené Scharfe2017-05-161-5/+8
| * | | | p0004: don't abort if multi-threaded is too slowRené Scharfe2017-05-161-4/+0
| * | | | p0004: use test_perfRené Scharfe2017-05-161-0/+36
| * | | | p0004: avoid using pipesRené Scharfe2017-05-161-3/+5
| * | | | p0004: simplify calls of test-lazy-init-name-hashRené Scharfe2017-05-161-3/+3
* | | | | Merge branch 'tb/pull-ff-rebase-autostash' into maintJunio C Hamano2017-06-132-11/+32
|\ \ \ \ \
| * | | | | pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostashTyler Brazier2017-06-012-11/+32
| | |_|/ / | |/| | |
* | | | | Merge branch 'jh/close-index-before-stat' into maintJunio C Hamano2017-06-131-4/+9
|\ \ \ \ \
| * | | | | read-cache: close index.lock in do_write_indexjh/close-index-before-statJeff Hostetler2017-04-281-4/+9
* | | | | | Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano2017-06-136-5/+109
|\ \ \ \ \ \
| * | | | | | clean: teach clean -d to preserve ignored pathssl/clean-d-ignored-fixSamuel Lijin2017-05-242-1/+43
| * | | | | | dir: expose cmp_name() and check_contains()Samuel Lijin2017-05-222-5/+9
| * | | | | | dir: hide untracked contents of untracked dirsSamuel Lijin2017-05-224-3/+41
| * | | | | | dir: recurse into untracked dirs for ignored filesSamuel Lijin2017-05-221-1/+4
| * | | | | | t7061: status --ignored should search untracked dirsSamuel Lijin2017-05-221-2/+3
| * | | | | | t7300: clean -d should skip dirs with ignored filesSamuel Lijin2017-05-221-0/+16
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' into maintJunio C Hamano2017-06-131-19/+35
|\ \ \ \ \ \
| * | | | | | send-email: Net::SMTP::starttls was introduced in v2.34dk/send-email-avoid-net-smtp-ssl-when-ableJonathan Nieder2017-06-011-1/+1
| * | | | | | send-email: Net::SMTP::SSL is obsolete, use only when necessaryDennis Kaarsemaker2017-05-201-19/+35
| |/ / / / /
* | | | | | Merge branch 'jc/skip-test-in-the-middle' into maintJunio C Hamano2017-06-132-50/+56
|\ \ \ \ \ \
| * | | | | | t5545: enhance test coverage when no http server is installedjc/skip-test-in-the-middleStefan Beller2017-05-181-42/+43
| * | | | | | test: allow skipping the remainderJunio C Hamano2017-05-181-8/+13
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'bw/forking-and-threading' into maintJunio C Hamano2017-06-139-134/+449
|\ \ \ \ \ \
| * | | | | | usage.c: drop set_error_handle()bw/forking-and-threadingJeff King2017-05-152-10/+1
| * | | | | | run-command: restrict PATH search to executable filesBrandon Williams2017-04-252-1/+48
| * | | | | | run-command: expose is_executable functionBrandon Williams2017-04-253-42/+44
| * | | | | | run-command: block signals between fork and execveEric Wong2017-04-201-0/+68
| * | | | | | run-command: add note about forking and threadingBrandon Williams2017-04-201-0/+9
| * | | | | | run-command: handle dup2 and close errors in childBrandon Williams2017-04-201-16/+42
| * | | | | | run-command: eliminate calls to error handling functions in childBrandon Williams2017-04-201-32/+89
| * | | | | | run-command: don't die in child when duping /dev/nullBrandon Williams2017-04-201-15/+13
| * | | | | | run-command: prepare child environment before forkingBrandon Williams2017-04-201-10/+56
| * | | | | | string-list: add string_list_remove functionBrandon Williams2017-04-202-0/+25
| * | | | | | run-command: use the async-signal-safe execv instead of execvpBrandon Williams2017-04-201-1/+29
| * | | | | | run-command: prepare command before forkingBrandon Williams2017-04-201-20/+26
| * | | | | | t0061: run_command executes scripts without a #! lineBrandon Williams2017-04-201-0/+11
| * | | | | | t5550: use write_script to generate post-update hookBrandon Williams2017-04-181-2/+3