Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.11.1v2.11.1 | Junio C Hamano | 2017-02-02 | 1 | -0/+3 |
* | Merge branch 'ws/request-pull-code-cleanup' into maint | Junio C Hamano | 2017-02-02 | 1 | -3/+0 |
|\ | |||||
| * | request-pull: drop old USAGE stuff | Wolfram Sang | 2017-01-16 | 1 | -3/+0 |
* | | Merge branch 'jk/execv-dashed-external' into maint | Junio C Hamano | 2017-02-02 | 3 | -21/+35 |
|\ \ | |||||
| * | | execv_dashed_external: wait for child on signal death | Jeff King | 2017-01-09 | 3 | -0/+21 |
| * | | execv_dashed_external: stop exiting with negative code | Jeff King | 2017-01-09 | 1 | -3/+7 |
| * | | execv_dashed_external: use child_process struct | Jeff King | 2017-01-09 | 1 | -18/+7 |
* | | | Ready for 2.11.1 | Junio C Hamano | 2017-01-31 | 1 | -0/+45 |
* | | | Merge branch 'sb/in-core-index-doc' into maint | Junio C Hamano | 2017-01-31 | 3 | -22/+32 |
|\ \ \ | |||||
| * | | | documentation: retire unfinished documentation | Stefan Beller | 2017-01-19 | 1 | -21/+0 |
| * | | | cache.h: document add_[file_]to_index | Stefan Beller | 2017-01-19 | 1 | -0/+10 |
| * | | | cache.h: document remove_index_entry_at | Stefan Beller | 2017-01-19 | 2 | -1/+3 |
| * | | | cache.h: document index_name_pos | Stefan Beller | 2017-01-19 | 1 | -0/+19 |
* | | | | Merge branch 'js/mingw-isatty' into maint | Junio C Hamano | 2017-01-31 | 1 | -7/+4 |
|\ \ \ \ | |||||
| * | | | | mingw: follow-up to "replace isatty() hack" | Johannes Schindelin | 2017-01-18 | 1 | -7/+4 |
* | | | | | Merge branch 'jk/coding-guidelines-update' into maint | Junio C Hamano | 2017-01-31 | 1 | -5/+32 |
|\ \ \ \ \ | |||||
| * | | | | | CodingGuidelines: clarify multi-line brace style | Jeff King | 2017-01-17 | 1 | -5/+32 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'js/exec-path-coverity-workaround' into maint | Junio C Hamano | 2017-01-31 | 1 | -6/+8 |
|\ \ \ \ \ | |||||
| * | | | | | git_exec_path: do not return the result of getenv() | Jeff King | 2017-01-09 | 1 | -9/+8 |
| * | | | | | git_exec_path: avoid Coverity warning about unfree()d result | Johannes Schindelin | 2017-01-09 | 1 | -1/+4 |
* | | | | | | Merge branch 'ad/bisect-terms' into maint | Junio C Hamano | 2017-01-31 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/bisect: improve on (bad|new) and (good|bad) | Christian Couder | 2017-01-13 | 1 | -2/+2 |
* | | | | | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix' into maint | Junio C Hamano | 2017-01-31 | 1 | -11/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7810: avoid assumption about invalid regex syntax | Jeff King | 2017-01-11 | 1 | -11/+15 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'km/branch-get-push-while-detached' into maint | Junio C Hamano | 2017-01-31 | 2 | -3/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | branch_get_push: do not segfault when HEAD is detached | Kyle Meyer | 2017-01-08 | 2 | -3/+9 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/rebase-i-squash-count-fix' into maint | Junio C Hamano | 2017-01-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase--interactive: count squash commits above 10 correctly | Jeff King | 2017-01-08 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jk/blame-fixes' into maint | Junio C Hamano | 2017-01-31 | 3 | -10/+166 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | blame: output porcelain "previous" header for each file | Jeff King | 2017-01-08 | 2 | -9/+131 |
| * | | | | | | | | blame: handle --no-abbrev | Jeff King | 2017-01-08 | 2 | -0/+6 |
| * | | | | | | | | blame: fix alignment with --abbrev=40 | Jeff King | 2017-01-08 | 2 | -1/+29 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/archive-zip-userdiff-config' into maint | Junio C Hamano | 2017-01-31 | 2 | -4/+25 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | archive-zip: load userdiff config | Jeff King | 2017-01-08 | 2 | -4/+25 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'dt/disable-bitmap-in-auto-gc' into maint | Junio C Hamano | 2017-01-31 | 4 | -6/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | repack: die on incremental + write-bitmap-index | David Turner | 2016-12-29 | 2 | -5/+12 |
| * | | | | | | | | auto gc: don't write bitmaps for incremental repacks | David Turner | 2016-12-29 | 2 | -1/+33 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'nd/config-misc-fixes' into maint | Junio C Hamano | 2017-01-31 | 1 | -5/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config.c: handle lock file in error case in git_config_rename_... | Nguyễn Thái Ngọc Duy | 2016-12-22 | 1 | -1/+3 |
| * | | | | | | | | config.c: rename label unlock_and_out | Nguyễn Thái Ngọc Duy | 2016-12-20 | 1 | -2/+2 |
| * | | | | | | | | config.c: handle error case for fstat() calls | Nguyễn Thái Ngọc Duy | 2016-12-20 | 1 | -2/+10 |
* | | | | | | | | | Merge branch 'jc/abbrev-autoscale-config' into maint | Junio C Hamano | 2017-01-31 | 2 | -8/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config.abbrev: document the new default that auto-scales | Junio C Hamano | 2016-12-22 | 2 | -8/+15 |
* | | | | | | | | | | Merge branch 'mh/fast-import-notes-fix-new' into maint | Junio C Hamano | 2017-01-31 | 2 | -3/+47 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fast-import: properly fanout notes when tree is imported | Mike Hommey | 2016-12-20 | 2 | -3/+47 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/compression-config' into maint | Junio C Hamano | 2017-01-31 | 9 | -31/+158 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | compression: unify pack.compression configuration parsing | Junio C Hamano | 2016-11-16 | 9 | -31/+158 |
* | | | | | | | | | | | Merge branch 'ew/svn-fixes' into maint | Junio C Hamano | 2017-01-31 | 2 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-svn: document useLogAuthor and addAuthorFrom config keys | Eric Wong | 2016-12-12 | 1 | -1/+7 |
| * | | | | | | | | | | | git-svn: allow "0" in SVN path components | Eric Wong | 2016-12-12 | 1 | -1/+1 |
| | |/ / / / / / / / / | |/| | | | | | | | | |