Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ks/status-initial-commit' | Junio C Hamano | 2017-06-30 | 5 | -3/+38 |
|\ | |||||
| * | status: contextually notify user about an initial commitks/status-initial-commit | Kaartic Sivaraam | 2017-06-21 | 5 | -3/+38 |
* | | Merge branch 'ab/die-errors-in-threaded' | Junio C Hamano | 2017-06-30 | 1 | -1/+17 |
|\ \ | |||||
| * | | die(): stop hiding errors due to overzealous recursion guardab/hide-die-errors-in-threadedab/die-errors-in-threaded | Ævar Arnfjörð Bjarmason | 2017-06-21 | 1 | -1/+17 |
| |/ | |||||
* | | Merge branch 'pw/rebase-i-regression-fix-tests' | Junio C Hamano | 2017-06-30 | 4 | -12/+148 |
|\ \ | |||||
| * | | t3420: fix under GETTEXT_POISON buildpw/rebase-i-regression-fix-tests | Junio C Hamano | 2017-06-23 | 1 | -2/+2 |
| * | | rebase: add more regression tests for console output | Phillip Wood | 2017-06-19 | 1 | -2/+69 |
| * | | rebase: add regression tests for console output | Phillip Wood | 2017-06-19 | 1 | -3/+64 |
| * | | rebase -i: add test for reflog message | Phillip Wood | 2017-06-19 | 1 | -0/+7 |
| * | | sequencer: print autostash messages to stderr | Johannes Schindelin | 2017-06-19 | 2 | -7/+8 |
* | | | Twelfth batch for 2.14 | Junio C Hamano | 2017-06-26 | 1 | -1/+11 |
* | | | Merge branch 'mb/reword-autocomplete-message' | Junio C Hamano | 2017-06-26 | 1 | -6/+12 |
|\ \ \ | |||||
| * | | | auto-correct: tweak phrasingmb/reword-autocomplete-message | Marc Branchaud | 2017-06-21 | 1 | -6/+12 |
* | | | | Merge branch 'ks/t7508-indent-fix' | Junio C Hamano | 2017-06-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | t7508: fix a broken indentationks/t7508-indent-fix | Kaartic Sivaraam | 2017-06-21 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'jk/add-p-commentchar-fix' | Junio C Hamano | 2017-06-26 | 2 | -1/+10 |
|\ \ \ \ | |||||
| * | | | | add--interactive: quote commentChar regexjk/add-p-commentchar-fix | Jeff King | 2017-06-21 | 2 | -1/+9 |
| * | | | | add--interactive: handle EOF in prompt_yesno | Jeff King | 2017-06-21 | 1 | -0/+1 |
* | | | | | Merge branch 'dt/raise-core-packed-git-limit' | Junio C Hamano | 2017-06-26 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | docs: update 64-bit core.packedGitLimit defaultdt/raise-core-packed-git-limit | Jeff King | 2017-06-21 | 1 | -1/+2 |
* | | | | | | Merge branch 'mh/packed-ref-store-prep' | Junio C Hamano | 2017-06-26 | 5 | -11/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | for_each_bisect_ref(): don't trim refnames | Michael Haggerty | 2017-06-18 | 4 | -2/+31 |
| * | | | | | | lock_packed_refs(): fix cache validity check | Michael Haggerty | 2017-06-12 | 1 | -9/+23 |
* | | | | | | | Merge branch 'lb/status-stash-count' | Junio C Hamano | 2017-06-26 | 12 | -38/+115 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | glossary: define 'stash entry'lb/status-stash-count | Liam Beguin | 2017-06-18 | 1 | -0/+4 |
| * | | | | | | | status: add optional stash count information | Liam Beguin | 2017-06-18 | 6 | -0/+71 |
| * | | | | | | | stash: update documentation to use 'stash entry' | Liam Beguin | 2017-06-18 | 6 | -38/+40 |
* | | | | | | | | Sync with 2.13.2 | Junio C Hamano | 2017-06-24 | 2 | -12/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 2.13.2v2.13.2 | Junio C Hamano | 2017-06-24 | 2 | -1/+18 |
| * | | | | | | | | Merge branch 'sn/reset-doc-typofix' into maint | Junio C Hamano | 2017-06-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sg/doc-pretty-formats' into maint | Junio C Hamano | 2017-06-24 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sd/t3200-branch-m-test' into maint | Junio C Hamano | 2017-06-24 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/revision-parser-skip-prefix' into maint | Junio C Hamano | 2017-06-24 | 2 | -48/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'km/test-mailinfo-b-failure' into maint | Junio C Hamano | 2017-06-24 | 1 | -0/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-rm-absorb' into maint | Junio C Hamano | 2017-06-24 | 1 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-tree-stale-comment' into maint | Junio C Hamano | 2017-06-24 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/stash-push-pathspec-fix' into maint | Junio C Hamano | 2017-06-24 | 2 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/github' into maint | Junio C Hamano | 2017-06-24 | 2 | -0/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2017-06-24 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-06-24 | 10 | -147/+301 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/name-rev-lw-tag' into maint | Junio C Hamano | 2017-06-24 | 2 | -8/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Eleventh batch for 2.14 | Junio C Hamano | 2017-06-24 | 1 | -15/+46 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 49 | -195/+117 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | *.[ch] refactoring: make use of the FREE_AND_NULL() macro | Ævar Arnfjörð Bjarmason | 2017-06-16 | 12 | -49/+23 |
| * | | | | | | | | | | | | | | | | | | | | coccinelle: make use of the "expression" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | 2 | -4/+2 |
| * | | | | | | | | | | | | | | | | | | | | coccinelle: add a rule to make "expression" code use FREE_AND_NULL() | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -0/+7 |
| * | | | | | | | | | | | | | | | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() rule | Ævar Arnfjörð Bjarmason | 2017-06-16 | 37 | -142/+71 |
| * | | | | | | | | | | | | | | | | | | | | coccinelle: add a rule to make "type" code use FREE_AND_NULL() | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -0/+8 |
| * | | | | | | | | | | | | | | | | | | | | git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL | Ævar Arnfjörð Bjarmason | 2017-06-15 | 1 | -0/+6 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/warn-add-gitlink' | Junio C Hamano | 2017-06-24 | 10 | -12/+113 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |