summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-06-24Git 2.13.2v2.13.2Junio C Hamano2-1/+18
2017-06-24Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano1-1/+1
2017-06-24Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano1-2/+2
2017-06-24Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano1-0/+17
2017-06-24Merge branch 'sg/revision-parser-skip-prefix' into maintJunio C Hamano2-48/+44
2017-06-24Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano1-0/+42
2017-06-24Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano1-4/+5
2017-06-24Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano1-3/+5
2017-06-24Merge branch 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2-0/+19
2017-06-24Merge branch 'ls/github' into maintJunio C Hamano2-0/+26
2017-06-24Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano1-1/+7
2017-06-24Merge branch 'jk/diff-blob' into maintJunio C Hamano10-147/+301
2017-06-24Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2-8/+53
2017-06-15docs/pretty-formats: stress that %- removes all preceding line-feedsSZEDER Gábor1-2/+2
2017-06-15doc: git-reset: fix a trivial typoŠtěpán Němec1-1/+1
2017-06-13Prepare for 2.13.2Junio C Hamano2-1/+38
2017-06-13Merge branch 'ad/pull-remote-doc' into maintJunio C Hamano1-3/+3
2017-06-13Merge branch 'jk/drop-free-refspecs' into maintJunio C Hamano1-22/+6
2017-06-13Merge branch 'jk/connect-symref-info-leak-fix' into maintJunio C Hamano1-1/+1
2017-06-13Merge branch 'rf/completion-config-commit' into maintJunio C Hamano1-0/+3
2017-06-13Merge branch 'ab/t3070-test-dedup' into maintJunio C Hamano1-1/+0
2017-06-13Merge branch 'jh/memihash-opt' into maintJunio C Hamano1-5/+42
2017-06-13Merge branch 'tb/pull-ff-rebase-autostash' into maintJunio C Hamano2-11/+32
2017-06-13Merge branch 'jh/close-index-before-stat' into maintJunio C Hamano1-4/+9
2017-06-13Merge branch 'sl/clean-d-ignored-fix' into maintJunio C Hamano6-5/+109
2017-06-13Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' into maintJunio C Hamano1-19/+35
2017-06-13Merge branch 'jc/skip-test-in-the-middle' into maintJunio C Hamano2-50/+56
2017-06-13Merge branch 'bw/forking-and-threading' into maintJunio C Hamano9-134/+449
2017-06-13Merge branch 'jk/bug-to-abort' into maintJunio C Hamano5-1/+51
2017-06-13Merge branch 'sb/checkout-recurse-submodules' into maintJunio C Hamano4-18/+12
2017-06-13Configure Git contribution guidelines for github.comLars Schneider2-0/+26
2017-06-13git-stash: fix pushing stash with pathspec from subdirPatrick Steinhardt2-0/+19
2017-06-13t3200: add test for single parameter passed to -m optionSahil Dua1-0/+17
2017-06-12revision.c: use skip_prefix() in handle_revision_pseudo_opt()SZEDER Gábor1-9/+9
2017-06-12revision.c: use skip_prefix() in handle_revision_opt()SZEDER Gábor1-25/+23
2017-06-12revision.c: stricter parsing of '--early-output'SZEDER Gábor1-10/+7
2017-06-12revision.c: stricter parsing of '--no-{min,max}-parents'SZEDER Gábor1-2/+2
2017-06-12revision.h: turn rev_info.early_output back into an unsigned intSZEDER Gábor1-2/+3
2017-06-12t5100: add some more mailinfo testsKyle J. McKay1-0/+42
2017-06-07Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano3-9/+28
2017-06-07sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2-9/+27
2017-06-07sha1dc: ignore indent-with-non-tab whitespace violationsJeff King1-0/+1
2017-06-07t5313: make extended-table test more deterministicJeff King1-1/+7
2017-06-05Git 2.13.1v2.13.1Junio C Hamano3-511/+46
2017-06-05Merge branch 'ah/doc-rev-parse-short-default' into maintJunio C Hamano2-6/+7
2017-06-05Merge branch 'ah/doc-filter-branch-export-env' into maintJunio C Hamano1-4/+1
2017-06-05Merge branch 'sd/t3200-typofix' into maintJunio C Hamano1-1/+1
2017-06-05Merge branch 'sb/t5531-update-desc' into maintJunio C Hamano1-2/+2
2017-06-05Merge branch 'ah/doc-pretty-format-fix' into maintJunio C Hamano1-1/+1
2017-06-05Merge branch 'ah/doc-interpret-trailers-ifexists' into maintJunio C Hamano1-1/+1
2017-06-05Merge branch 'ab/ref-filter-no-contains' into maintJunio C Hamano1-1/+1
2017-06-05Merge branch 'sg/core-filemode-doc-typofix' into maintJunio C Hamano1-1/+1
2017-06-05Merge branch 'tb/dedup-crlf-tests' into maintJunio C Hamano2-187/+0
2017-06-05Merge branch 'jn/credential-doc-on-clear' into maintJunio C Hamano1-10/+10
2017-06-05Merge branch 'jk/url-insteadof-config' into maintJunio C Hamano2-0/+17
2017-06-05Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano1-0/+3
2017-06-05Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano7-88/+172
2017-06-05Merge branch 'js/bs-is-a-dir-sep-on-windows' into maintJunio C Hamano2-2/+11
2017-06-05Merge branch 'jk/alternate-ref-optim' into maintJunio C Hamano1-1/+4
2017-06-05Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano5-13/+32
2017-06-05Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano1-7/+9
2017-06-05Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2-2/+3
2017-06-05Merge branch 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2-1/+11
2017-06-05Merge branch 'ab/c-translators-comment-style' into maintJunio C Hamano9-26/+46
2017-06-05Merge branch 'ls/travis-doc-asciidoctor' into maintJunio C Hamano2-4/+16
2017-06-04Documentation/git-rm: correct submodule descriptionStefan Beller1-4/+5
2017-06-04Prepare for 2.13.1; more topics to followJunio C Hamano2-1/+70
2017-06-04Merge branch 'tg/stash-push-fixup' into maintJunio C Hamano1-1/+4
2017-06-04Merge branch 'km/log-showsignature-doc' into maintJunio C Hamano1-0/+4
2017-06-04Merge branch 'jt/use-trailer-api-in-commands' into maintJunio C Hamano2-7/+48
2017-06-04Merge branch 'jt/push-options-doc' into maintJunio C Hamano4-11/+114
2017-06-04Merge branch 'js/plug-leaks' into maintJunio C Hamano23-64/+149
2017-06-04Merge branch 'js/eol-on-ourselves' into maintJunio C Hamano11-26/+55
2017-06-04Merge branch 'jk/update-links-in-docs' into maintJunio C Hamano3-3/+3
2017-06-04Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links' into maintJunio C Hamano2-2/+27
2017-06-04Merge branch 'jk/doc-config-include' into maintJunio C Hamano1-10/+21
2017-06-04Merge branch 'jk/disable-pack-reuse-when-broken' into maintJunio C Hamano2-4/+50
2017-06-04Merge branch 'jk/am-leakfix' into maintJunio C Hamano1-20/+14
2017-06-04Merge branch 'jc/read-tree-empty-with-m' into maintJunio C Hamano1-1/+1
2017-06-04Merge branch 'jc/apply-fix-mismerge' into maintJunio C Hamano1-169/+169
2017-06-04Merge branch 'ja/do-not-ask-needless-questions' into maintJunio C Hamano6-11/+12
2017-06-04Merge branch 'bw/submodule-with-bs-path' into maintJunio C Hamano1-1/+1
2017-06-04Merge branch 'ah/log-decorate-default-to-auto' into maintJunio C Hamano2-2/+14
2017-06-04Merge branch 'ab/fix-poison-tests' into maintJunio C Hamano16-37/+48
2017-06-04Merge branch 'ab/doc-replace-gmane-links' into maintJunio C Hamano5-6/+6
2017-06-04Merge branch 'ab/aix-needs-compat-regex' into maintJunio C Hamano1-0/+1
2017-06-04Merge branch 'pw/rebase-i-regression-fix' into maintJunio C Hamano1-1/+4
2017-06-02docs: fix formatting and grammarAdam Dinwoodie1-3/+3
2017-06-02diff-tree: update stale in-code commentsJunio C Hamano1-3/+5
2017-06-01pull: ff --rebase --autostash works in dirty repoTyler Brazier2-11/+32
2017-06-01send-email: Net::SMTP::starttls was introduced in v2.34Jonathan Nieder1-1/+1
2017-06-01doc: rewrite description for rev-parse --shortAndreas Heiduk2-6/+7
2017-06-01docs/config: mention protocol implications of url.insteadOfJeff King2-0/+17
2017-06-01remote: drop free_refspecs() functionJeff King1-22/+6
2017-05-31C style: use standard style for "TRANSLATORS" commentsÆvar Arnfjörð Bjarmason9-26/+46
2017-05-30am: handle "-h" argument earlierJeff King1-0/+3
2017-05-30completion: add completions for git config commitRikard Falkeborn1-0/+3
2017-05-29branch test: fix invalid config key accessSahil Dua1-1/+1
2017-05-29wildmatch test: remove redundant duplicate testÆvar Arnfjörð Bjarmason1-1/+0
2017-05-29doc: filter-branch does not require re-export of varsAndreas Heiduk1-4/+1
2017-05-26connect.c: fix leak in parse_one_symref_info()Jeff King1-1/+1
2017-05-26docs/config.txt: fix indefinite article in core.fileMode descriptionSZEDER Gábor1-1/+1
2017-05-26Windows: do not treat a path with backslashes as a remote's nick nameJohannes Sixt1-1/+6
2017-05-24diff: use blob path for blob/file diffsJeff King2-2/+8
2017-05-24diff: use pending "path" if it is availableJeff King2-3/+8
2017-05-24diff: use the word "path" instead of "name" for blobsJeff King1-7/+7
2017-05-24diff: pass whole pending entry in blobinfoJeff King1-23/+15
2017-05-24handle_revision_arg: record paths for pending objectsJeff King1-11/+21
2017-05-24handle_revision_arg: record modes for "a..b" endpointsJeff King2-5/+7
2017-05-24t4063: add tests of direct blob diffsJeff King1-0/+91
2017-05-24get_sha1_with_context: dynamically allocate oc->pathJeff King5-8/+24
2017-05-24get_sha1_with_context: always initialize oc->symlink_pathJeff King2-1/+1
2017-05-24sha1_name: consistently refer to object_context as "oc"Jeff King2-3/+3
2017-05-24handle_revision_arg: add handle_dotdot() helperJeff King1-75/+102
2017-05-24handle_revision_arg: hoist ".." check out of range parsingJeff King1-14/+10
2017-05-24handle_revision_arg: stop using "dotdot" as a generic pointerJeff King1-14/+15
2017-05-24handle_revision_arg: simplify commit reference lookupsJeff King1-6/+2
2017-05-24handle_revision_arg: reset "dotdot" consistentlyJeff King2-0/+12
2017-05-24clean: teach clean -d to preserve ignored pathsSamuel Lijin2-1/+43
2017-05-23tag: duplicate mention of --contains should mention --no-containsÆvar Arnfjörð Bjarmason1-1/+1
2017-05-23mingw.h: permit arguments with side effects for is_dir_sepJohannes Sixt1-1/+5
2017-05-23Documentation: fix formatting typo in pretty-formats.txtAndreas Heiduk1-1/+1
2017-05-23Documentation: fix reference to ifExists for interpret-trailersAndreas Heiduk1-1/+1
2017-05-23t5531: fix test descriptionStefan Beller1-2/+2
2017-05-22dir: expose cmp_name() and check_contains()Samuel Lijin2-5/+9
2017-05-22dir: hide untracked contents of untracked dirsSamuel Lijin4-3/+41
2017-05-22dir: recurse into untracked dirs for ignored filesSamuel Lijin1-1/+4
2017-05-22t7061: status --ignored should search untracked dirsSamuel Lijin1-2/+3
2017-05-22t7300: clean -d should skip dirs with ignored filesSamuel Lijin1-0/+16
2017-05-22usage: add NORETURN to BUG() function definitionsRamsay Jones1-2/+2
2017-05-22sha1dc: update from upstreamÆvar Arnfjörð Bjarmason7-88/+172
2017-05-20send-email: Net::SMTP::SSL is obsolete, use only when necessaryDennis Kaarsemaker1-19/+35
2017-05-20revision.c: ignore broken tags with ignore_missing_linksJeff King2-2/+27
2017-05-20config.txt: add an entry for log.showSignatureKyle Meyer1-0/+4
2017-05-20rebase -i: add missing newline to end of messagePhillip Wood1-1/+1
2017-05-20rebase -i: silence stash applyPhillip Wood1-0/+2
2017-05-20rebase -i: fix reflog messagePhillip Wood1-0/+1
2017-05-20ref-filter: resolve HEAD when parsing %(HEAD) atomJeff King1-7/+9
2017-05-18interpret-trailers: honor the cut lineBrian Malehorn5-13/+32
2017-05-18t5400: avoid concurrent writes into a trace fileJeff King1-1/+4
2017-05-18t5545: enhance test coverage when no http server is installedStefan Beller1-42/+43
2017-05-18test: allow skipping the remainderJunio C Hamano1-8/+13
2017-05-17completion: add git stash pushThomas Gummerer1-1/+4
2017-05-16p0004: don't error out if test repo is too smallRené Scharfe1-5/+8
2017-05-16p0004: don't abort if multi-threaded is too slowRené Scharfe1-4/+0
2017-05-16p0004: use test_perfRené Scharfe1-0/+36
2017-05-16p0004: avoid using pipesRené Scharfe1-3/+5
2017-05-16p0004: simplify calls of test-lazy-init-name-hashRené Scharfe1-3/+3
2017-05-15doc: use https links to Wikipedia to avoid http redirectsSven Strickroth3-3/+3
2017-05-15usage.c: drop set_error_handle()Jeff King2-10/+1
2017-05-15builtin/log: honor log.decoratebrian m. carlson2-2/+14
2017-05-15config: complain about --local outside of a git repoJeff King2-1/+4
2017-05-15setup_git_env: convert die("BUG") to BUG()Jeff King2-1/+7
2017-05-15usage.c: add BUG() functionJeff King2-0/+41
2017-05-12git-filter-branch: be more direct in an error messageJean-Noel Avila1-1/+1
2017-05-12read-tree -m: make error message for merging 0 trees less smart aleckJean-Noel Avila2-3/+4
2017-05-12usability: don't ask questions if no reply is requiredJean-Noel Avila3-7/+7
2017-05-12docs/config: consistify include.path examplesJeff King1-2/+2
2017-05-12docs/config: avoid the term "expand" for includesJeff King1-4/+4
2017-05-12docs/config: give a relative includeIf exampleJeff King1-0/+6
2017-05-12docs/config: clarify include/includeIf relationshipJeff King1-6/+11
2017-05-11travis-ci: add job to run tests with GETTEXT_POISONLars Schneider1-0/+5
2017-05-11travis-ci: setup "prove cache" in "script" stepLars Schneider1-3/+5
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason15-34/+38
2017-05-10read-tree: "read-tree -m --empty" does not make senseJunio C Hamano1-1/+1
2017-05-10t0027: tests are not expensive; remove t0025Torsten Bögershausen2-187/+0
2017-05-10t4051: mark supporting files as requiring LF-only line endingsJohannes Schindelin1-0/+1
2017-05-10Fix the remaining tests that failed with core.autocrlf=trueJohannes Schindelin1-1/+20
2017-05-10t3901: move supporting files into t/t3901/Johannes Schindelin6-24/+24
2017-05-10completion: mark bash script as LF-onlyJohannes Schindelin1-0/+1
2017-05-10git-new-workdir: mark script as LF-onlyJohannes Schindelin1-0/+1
2017-05-10Fix build with core.autocrlf=trueJohannes Schindelin2-1/+8
2017-05-10receive-pack: verify push options in certJonathan Tan3-8/+112
2017-05-09doc: replace more gmane linksJunio C Hamano4-4/+4
2017-05-09checkout: fix memory leakJunio C Hamano1-0/+1
2017-05-09Git 2.13v2.13.0Junio C Hamano3-1/+14
2017-05-09Merge tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-poJunio C Hamano9-19174/+23732
2017-05-09Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-434/+439
2017-05-09l10n: zh_CN: for git v2.13.0 l10n round 2Jiang Xin1-429/+436
2017-05-09l10n: sv.po: Update Swedish translation (3195t0f0u)Peter Krefting1-434/+439
2017-05-08Sync with v2.12.3Junio C Hamano11-11/+116
2017-05-09Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano1-8/+26
2017-05-09docs: correct receive.advertisePushOptions defaultJonathan Tan1-3/+2
2017-05-09t5310: fix "; do" styleJeff King1-4/+8
2017-05-09pack-objects: disable pack reuse for object-selection optionsJeff King2-1/+43
2017-05-08apply.c: fix whitespace-only mismergeJunio C Hamano1-169/+169
2017-05-09l10n: zh_CN: review for git v2.13.0 l10n round 1Ray Chen1-17/+17
2017-05-09Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-431/+438
2017-05-09l10n: Update Catalan translationJordi Mas1-2126/+2491
2017-05-09l10n: bg.po: Updated Bulgarian translation (3195t)Alexander Shopov1-85/+61
2017-05-09Merge branch 'fr_l10n_v2.13_rnd2' of git://github.com/jnavila/gitJiang Xin1-448/+478
2017-05-08submodule_uses_worktrees(): plug memory leakJohannes Schindelin1-1/+1
2017-05-08show_worktree(): plug memory leakJohannes Schindelin1-3/+5
2017-05-08name-rev: avoid leaking memory in the `deref` caseJohannes Schindelin1-2/+5
2017-05-08remote: plug memory leak in match_explicit()Johannes Schindelin1-2/+3
2017-05-08add_reflog_for_walk: avoid memory leakJohannes Schindelin1-3/+17
2017-05-08shallow: avoid memory leakJohannes Schindelin1-2/+6
2017-05-08line-log: avoid memory leakJohannes Schindelin1-0/+1
2017-05-08receive-pack: plug memory leak in update()Johannes Schindelin1-1/+3
2017-05-08fast-export: avoid leaking memory in handle_tag()Johannes Schindelin1-0/+2