Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/apply-validate-input' | Junio C Hamano | 2017-06-30 | 4 | -7/+86 |
|\ | |||||
| * | apply: check git diffs for mutually exclusive header lines | René Scharfe | 2017-06-27 | 2 | -0/+33 |
| * | apply: check git diffs for invalid file modes | René Scharfe | 2017-06-27 | 2 | -6/+27 |
| * | apply: check git diffs for missing old filenames | René Scharfe | 2017-06-27 | 2 | -1/+26 |
* | | Merge branch 'jc/pack-bitmap-unaligned' | Junio C Hamano | 2017-06-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | pack-bitmap: don't perform unaligned memory access | James Clarke | 2017-06-26 | 1 | -1/+1 |
* | | | Merge branch 'ah/doc-pretty-color-auto-prefix' | Junio C Hamano | 2017-06-30 | 1 | -5/+6 |
|\ \ \ | |||||
| * | | | doc: clarify syntax for %C(auto,...) in pretty formats | Andreas Heiduk | 2017-06-24 | 1 | -5/+6 |
* | | | | Merge branch 'ks/submodule-add-doc' | Junio C Hamano | 2017-06-30 | 1 | -28/+21 |
|\ \ \ \ | |||||
| * | | | | Documentation/git-submodule: cleanup "add" section | Kaartic Sivaraam | 2017-06-22 | 1 | -28/+21 |
* | | | | | Merge branch 'ks/status-initial-commit' | Junio C Hamano | 2017-06-30 | 5 | -3/+38 |
|\ \ \ \ \ | |||||
| * | | | | | status: contextually notify user about an initial commit | Kaartic Sivaraam | 2017-06-22 | 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 guard | Æ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 build | 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 phrasing | 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 indentation | 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 regex | 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 default | 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-19 | 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' | Liam Beguin | 2017-06-19 | 1 | -0/+4 |
| * | | | | | | | | | | status: add optional stash count information | Liam Beguin | 2017-06-19 | 6 | -0/+71 |
| * | | | | | | | | | | stash: update documentation to use 'stash entry' | Liam Beguin | 2017-06-19 | 6 | -38/+40 |
* | | | | | | | | | | | Sync with 2.13.2 | Junio C Hamano | 2017-06-25 | 2 | -12/+17 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Git 2.13.2v2.13.2 | Junio C Hamano | 2017-06-25 | 2 | -1/+18 |
| * | | | | | | | | | | | Merge branch 'sn/reset-doc-typofix' into maint | Junio C Hamano | 2017-06-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/doc-pretty-formats' into maint | Junio C Hamano | 2017-06-25 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sd/t3200-branch-m-test' into maint | Junio C Hamano | 2017-06-25 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/revision-parser-skip-prefix' into maint | Junio C Hamano | 2017-06-25 | 2 | -48/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'km/test-mailinfo-b-failure' into maint | Junio C Hamano | 2017-06-25 | 1 | -0/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-rm-absorb' into maint | Junio C Hamano | 2017-06-25 | 1 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/diff-tree-stale-comment' into maint | Junio C Hamano | 2017-06-25 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/stash-push-pathspec-fix' into maint | Junio C Hamano | 2017-06-25 | 2 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/github' into maint | Junio C Hamano | 2017-06-25 | 2 | -0/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2017-06-25 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-06-25 | 10 | -147/+301 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |