summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/apply-validate-input'Junio C Hamano2017-06-304-7/+86
|\
| * apply: check git diffs for mutually exclusive header linesRené Scharfe2017-06-272-0/+33
| * apply: check git diffs for invalid file modesRené Scharfe2017-06-272-6/+27
| * apply: check git diffs for missing old filenamesRené Scharfe2017-06-272-1/+26
* | Merge branch 'jc/pack-bitmap-unaligned'Junio C Hamano2017-06-301-1/+1
|\ \
| * | pack-bitmap: don't perform unaligned memory accessJames Clarke2017-06-261-1/+1
* | | Merge branch 'ah/doc-pretty-color-auto-prefix'Junio C Hamano2017-06-301-5/+6
|\ \ \
| * | | doc: clarify syntax for %C(auto,...) in pretty formatsAndreas Heiduk2017-06-241-5/+6
* | | | Merge branch 'ks/submodule-add-doc'Junio C Hamano2017-06-301-28/+21
|\ \ \ \
| * | | | Documentation/git-submodule: cleanup "add" sectionKaartic Sivaraam2017-06-221-28/+21
* | | | | Merge branch 'ks/status-initial-commit'Junio C Hamano2017-06-305-3/+38
|\ \ \ \ \
| * | | | | status: contextually notify user about an initial commitKaartic Sivaraam2017-06-225-3/+38
* | | | | | Merge branch 'ab/die-errors-in-threaded'Junio C Hamano2017-06-301-1/+17
|\ \ \ \ \ \
| * | | | | | die(): stop hiding errors due to overzealous recursion guardÆvar Arnfjörð Bjarmason2017-06-211-1/+17
| |/ / / / /
* | | | | | Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano2017-06-304-12/+148
|\ \ \ \ \ \
| * | | | | | t3420: fix under GETTEXT_POISON buildJunio C Hamano2017-06-231-2/+2
| * | | | | | rebase: add more regression tests for console outputPhillip Wood2017-06-191-2/+69
| * | | | | | rebase: add regression tests for console outputPhillip Wood2017-06-191-3/+64
| * | | | | | rebase -i: add test for reflog messagePhillip Wood2017-06-191-0/+7
| * | | | | | sequencer: print autostash messages to stderrJohannes Schindelin2017-06-192-7/+8
* | | | | | | Twelfth batch for 2.14Junio C Hamano2017-06-261-1/+11
* | | | | | | Merge branch 'mb/reword-autocomplete-message'Junio C Hamano2017-06-261-6/+12
|\ \ \ \ \ \ \
| * | | | | | | auto-correct: tweak phrasingMarc Branchaud2017-06-211-6/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ks/t7508-indent-fix'Junio C Hamano2017-06-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t7508: fix a broken indentationKaartic Sivaraam2017-06-211-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'jk/add-p-commentchar-fix'Junio C Hamano2017-06-262-1/+10
|\ \ \ \ \ \ \
| * | | | | | | add--interactive: quote commentChar regexJeff King2017-06-212-1/+9
| * | | | | | | add--interactive: handle EOF in prompt_yesnoJeff King2017-06-211-0/+1
* | | | | | | | Merge branch 'dt/raise-core-packed-git-limit'Junio C Hamano2017-06-261-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: update 64-bit core.packedGitLimit defaultJeff King2017-06-211-1/+2
* | | | | | | | | Merge branch 'mh/packed-ref-store-prep'Junio C Hamano2017-06-265-11/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | for_each_bisect_ref(): don't trim refnamesMichael Haggerty2017-06-194-2/+31
| * | | | | | | | | lock_packed_refs(): fix cache validity checkMichael Haggerty2017-06-121-9/+23
* | | | | | | | | | Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-2612-38/+115
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | glossary: define 'stash entry'Liam Beguin2017-06-191-0/+4
| * | | | | | | | | | status: add optional stash count informationLiam Beguin2017-06-196-0/+71
| * | | | | | | | | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-196-38/+40
* | | | | | | | | | | Sync with 2.13.2Junio C Hamano2017-06-252-12/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Git 2.13.2v2.13.2Junio C Hamano2017-06-252-1/+18
| * | | | | | | | | | | Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano2017-06-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano2017-06-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano2017-06-251-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/revision-parser-skip-prefix' into maintJunio C Hamano2017-06-252-48/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano2017-06-251-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano2017-06-251-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano2017-06-251-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2017-06-252-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/github' into maintJunio C Hamano2017-06-252-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2017-06-251-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-2510-147/+301
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \