summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ks/status-initial-commit'Junio C Hamano2017-06-305-3/+38
|\
| * status: contextually notify user about an initial commitks/status-initial-commitKaartic Sivaraam2017-06-215-3/+38
* | Merge branch 'ab/die-errors-in-threaded'Junio C Hamano2017-06-301-1/+17
|\ \
| * | die(): stop hiding errors due to overzealous recursion guardab/hide-die-errors-in-threadedab/die-errors-in-threadedÆ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 buildpw/rebase-i-regression-fix-testsJunio 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 phrasingmb/reword-autocomplete-messageMarc Branchaud2017-06-211-6/+12
* | | | Merge branch 'ks/t7508-indent-fix'Junio C Hamano2017-06-261-1/+1
|\ \ \ \
| * | | | t7508: fix a broken indentationks/t7508-indent-fixKaartic Sivaraam2017-06-211-1/+1
| |/ / /
* | | | Merge branch 'jk/add-p-commentchar-fix'Junio C Hamano2017-06-262-1/+10
|\ \ \ \
| * | | | add--interactive: quote commentChar regexjk/add-p-commentchar-fixJeff 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 defaultdt/raise-core-packed-git-limitJeff 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-184-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'lb/status-stash-countLiam Beguin2017-06-181-0/+4
| * | | | | | | status: add optional stash count informationLiam Beguin2017-06-186-0/+71
| * | | | | | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-186-38/+40
* | | | | | | | Sync with 2.13.2Junio C Hamano2017-06-242-12/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Git 2.13.2v2.13.2Junio C Hamano2017-06-242-1/+18
| * | | | | | | | Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano2017-06-241-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano2017-06-241-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano2017-06-241-0/+17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/revision-parser-skip-prefix' into maintJunio C Hamano2017-06-242-48/+44
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano2017-06-241-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano2017-06-241-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano2017-06-241-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2017-06-242-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/github' into maintJunio C Hamano2017-06-242-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2017-06-241-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-2410-147/+301
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-242-8/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Eleventh batch for 2.14Junio C Hamano2017-06-241-15/+46
* | | | | | | | | | | | | | | | | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-2449-195/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | *.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason2017-06-1612-49/+23
| * | | | | | | | | | | | | | | | | | | | coccinelle: make use of the "expression" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-162-4/+2
| * | | | | | | | | | | | | | | | | | | | coccinelle: add a rule to make "expression" code use FREE_AND_NULL()Ævar Arnfjörð Bjarmason2017-06-161-0/+7
| * | | | | | | | | | | | | | | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-1637-142/+71
| * | | | | | | | | | | | | | | | | | | | coccinelle: add a rule to make "type" code use FREE_AND_NULL()Ævar Arnfjörð Bjarmason2017-06-161-0/+8
| * | | | | | | | | | | | | | | | | | | | git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULLÆvar Arnfjörð Bjarmason2017-06-151-0/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/warn-add-gitlink'Junio C Hamano2017-06-2410-12/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \