summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | diff: use the word "path" instead of "name" for blobsJeff King2017-05-241-7/+7
| * | | | | | | | | | | | | | | | diff: pass whole pending entry in blobinfoJeff King2017-05-241-23/+15
| * | | | | | | | | | | | | | | | handle_revision_arg: record paths for pending objectsJeff King2017-05-241-11/+21
| * | | | | | | | | | | | | | | | handle_revision_arg: record modes for "a..b" endpointsJeff King2017-05-242-5/+7
| * | | | | | | | | | | | | | | | t4063: add tests of direct blob diffsJeff King2017-05-241-0/+91
| * | | | | | | | | | | | | | | | get_sha1_with_context: dynamically allocate oc->pathJeff King2017-05-245-8/+24
| * | | | | | | | | | | | | | | | get_sha1_with_context: always initialize oc->symlink_pathJeff King2017-05-242-1/+1
| * | | | | | | | | | | | | | | | sha1_name: consistently refer to object_context as "oc"Jeff King2017-05-242-3/+3
| * | | | | | | | | | | | | | | | handle_revision_arg: add handle_dotdot() helperJeff King2017-05-241-75/+102
| * | | | | | | | | | | | | | | | handle_revision_arg: hoist ".." check out of range parsingJeff King2017-05-241-14/+10
| * | | | | | | | | | | | | | | | handle_revision_arg: stop using "dotdot" as a generic pointerJeff King2017-05-241-14/+15
| * | | | | | | | | | | | | | | | handle_revision_arg: simplify commit reference lookupsJeff King2017-05-241-6/+2
| * | | | | | | | | | | | | | | | handle_revision_arg: reset "dotdot" consistentlyJeff King2017-05-242-0/+12
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-242-8/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | name-rev: favor describing with tags and use committer date to tiebreakjc/name-rev-lw-tagJunio C Hamano2017-03-292-10/+45
| * | | | | | | | | | | | | | | name-rev: refactor logic to see if a new candidate is a better nameJunio C Hamano2017-03-291-3/+13
* | | | | | | | | | | | | | | | 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
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |