Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-merge | Dave Ware | 2016-01-20 | 2 | -2/+70 |
* | Merge branch 'dg/subtree-test-cleanup' | Jeff King | 2015-12-01 | 3 | -443/+956 |
|\ | |||||
| * | contrib/subtree: Handle '--prefix' argument with a slash appended | Techlive Zheng | 2015-11-13 | 2 | -1/+21 |
| * | contrib/subtree: Make each test self-contained | Techlive Zheng | 2015-11-13 | 1 | -418/+840 |
| * | contrib/subtree: Add split tests | Techlive Zheng | 2015-11-13 | 1 | -2/+15 |
| * | contrib/subtree: Add merge tests | Techlive Zheng | 2015-11-13 | 1 | -1/+12 |
| * | contrib/subtree: Add tests for subtree add | Techlive Zheng | 2015-11-13 | 1 | -0/+19 |
| * | contrib/subtree: Add test for missing subtree | Techlive Zheng | 2015-11-13 | 1 | -0/+4 |
| * | contrib/subtree: Clean and refactor test code | Techlive Zheng | 2015-11-13 | 2 | -55/+79 |
* | | Merge branch 'dt/http-range' | Jeff King | 2015-12-01 | 1 | -4/+4 |
|\ \ | |||||
| * | | http: fix some printf format warnings | Ramsay Jones | 2015-11-11 | 1 | -4/+4 |
* | | | Merge branch 'maint' | Jeff King | 2015-12-01 | 15 | -82/+140 |
|\ \ \ | |||||
| * \ \ | Merge branch 'eg/p4-submit-catch-failure' into maint | Jeff King | 2015-12-01 | 2 | -35/+38 |
| |\ \ \ | |||||
| | * | | | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failure | GIRARD Etienne | 2015-11-24 | 2 | -35/+38 |
| * | | | | Merge branch 'dk/check-ignore-docs' into maint | Jeff King | 2015-12-01 | 1 | -5/+5 |
| |\ \ \ \ | |||||
| | * | | | | check-ignore: correct documentation about outputdk/check-ignore-docs | Dennis Kaarsemaker | 2015-11-24 | 1 | -5/+5 |
| * | | | | | Merge branch 'ld/p4-detached-head' into maint | Jeff King | 2015-12-01 | 2 | -9/+36 |
| |\ \ \ \ \ | |||||
| | * | | | | | git-p4: work with a detached headld/p4-detached-head | Luke Diamand | 2015-11-24 | 2 | -8/+17 |
| | * | | | | | git-p4: add option to system() to return subshell status | Luke Diamand | 2015-11-24 | 1 | -2/+4 |
| | * | | | | | git-p4: add failing test for submit from detached head | Luke Diamand | 2015-11-24 | 1 | -0/+16 |
| * | | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maint | Jeff King | 2015-12-01 | 2 | -1/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filtersg/filter-branch-dwim-ambiguity | SZEDER Gábor | 2015-11-24 | 2 | -1/+8 |
| * | | | | | | | Merge branch 'mg/doc-word-diff-example' into maint | Jeff King | 2015-12-01 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Documentation/diff: give --word-diff-regex=. examplemg/doc-word-diff-example | Michael J Gruber | 2015-11-24 | 1 | -0/+3 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'cb/ssl-config-pathnames' into maint | Jeff King | 2015-12-01 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | http: treat config options sslCAPath and sslCAInfo as pathscb/ssl-config-pathnames | Charles Bailey | 2015-11-24 | 1 | -2/+2 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'dk/t5813-unc-paths' into maint | Jeff King | 2015-12-01 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | t5813: avoid creating urls that break on cygwindk/t5813-unc-paths | Dennis Kaarsemaker | 2015-11-20 | 1 | -2/+2 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'dk/rerere-train-quoting' into maint | Jeff King | 2015-12-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Escape Git's exec path in contrib/rerere-train.sh scriptdk/rerere-train-quoting | Daniel Knittl-Frank | 2015-11-20 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'cb/hook-sigpipe' into maint | Jeff King | 2015-12-01 | 3 | -20/+27 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | allow hooks to ignore their standard input streamcb/hook-sigpipe | Clemens Buchacher | 2015-11-16 | 3 | -20/+27 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'fm/shell-path-whitespace' into maint | Jeff King | 2015-12-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | rebase-i-exec: Allow space in SHELL_PATHfm/shell-path-whitespace | Fredrik Medley | 2015-11-13 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'ar/doc-env-variable-format' into maint | Jeff King | 2015-12-01 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Documentation: make environment variable formatting more consistentar/doc-env-variable-format | Андрей Рыбак | 2015-11-11 | 1 | -6/+6 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'pt/http-socks-proxy' into maint | Jeff King | 2015-12-01 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | remote-http(s): support SOCKS proxiespt/http-socks-proxy | Pat Thoyts | 2015-11-20 | 1 | -0/+11 |
| * | | | | | | | | Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maint | Jeff King | 2015-12-01 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fp/subtree-todo-update' | Jeff King | 2015-11-24 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | contrib/subtree: remove "push" command from the "todo" filefp/subtree-todo-update | Fabio Porcedda | 2015-11-06 | 1 | -2/+0 |
* | | | | | | | | | | Merge branch 'rc/configure-use-libs-when-checking-a-lib' | Jeff King | 2015-11-24 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | configure.ac: use $LIBS not $CFLAGS when testing -lpthreadrc/configure-use-libs-when-checking-a-lib | Rainer M. Canavan | 2015-11-06 | 1 | -1/+7 |
* | | | | | | | | | | Merge branch 'maint' | Jeff King | 2015-11-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Documentation/git-update-index: add missing opts to synopsys | Christian Couder | 2015-11-24 | 1 | -0/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svn | Jeff King | 2015-11-20 | 1 | -8/+76 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-svn: improve rebase/mkdirs performance | Dair Grant | 2015-11-10 | 1 | -8/+76 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'lf/ref-is-hidden-namespace' | Jeff King | 2015-11-20 | 6 | -15/+100 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5509: add basic tests for hideRefslf/ref-is-hidden-namespace | Lukas Fleischer | 2015-11-05 | 1 | -0/+41 |
| * | | | | | | | | | hideRefs: add support for matching full refs | Lukas Fleischer | 2015-11-05 | 5 | -16/+52 |