summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-mergeDave Ware2016-01-202-2/+70
* Merge branch 'dg/subtree-test-cleanup'Jeff King2015-12-013-443/+956
|\
| * contrib/subtree: Handle '--prefix' argument with a slash appendedTechlive Zheng2015-11-132-1/+21
| * contrib/subtree: Make each test self-containedTechlive Zheng2015-11-131-418/+840
| * contrib/subtree: Add split testsTechlive Zheng2015-11-131-2/+15
| * contrib/subtree: Add merge testsTechlive Zheng2015-11-131-1/+12
| * contrib/subtree: Add tests for subtree addTechlive Zheng2015-11-131-0/+19
| * contrib/subtree: Add test for missing subtreeTechlive Zheng2015-11-131-0/+4
| * contrib/subtree: Clean and refactor test codeTechlive Zheng2015-11-132-55/+79
* | Merge branch 'dt/http-range'Jeff King2015-12-011-4/+4
|\ \
| * | http: fix some printf format warningsRamsay Jones2015-11-111-4/+4
* | | Merge branch 'maint'Jeff King2015-12-0115-82/+140
|\ \ \
| * \ \ Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-012-35/+38
| |\ \ \
| | * | | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failureGIRARD Etienne2015-11-242-35/+38
| * | | | Merge branch 'dk/check-ignore-docs' into maintJeff King2015-12-011-5/+5
| |\ \ \ \
| | * | | | check-ignore: correct documentation about outputdk/check-ignore-docsDennis Kaarsemaker2015-11-241-5/+5
| * | | | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-012-9/+36
| |\ \ \ \ \
| | * | | | | git-p4: work with a detached headld/p4-detached-headLuke Diamand2015-11-242-8/+17
| | * | | | | git-p4: add option to system() to return subshell statusLuke Diamand2015-11-241-2/+4
| | * | | | | git-p4: add failing test for submit from detached headLuke Diamand2015-11-241-0/+16
| * | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maintJeff King2015-12-012-1/+8
| |\ \ \ \ \ \
| | * | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filtersg/filter-branch-dwim-ambiguitySZEDER Gábor2015-11-242-1/+8
| * | | | | | | Merge branch 'mg/doc-word-diff-example' into maintJeff King2015-12-011-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Documentation/diff: give --word-diff-regex=. examplemg/doc-word-diff-exampleMichael J Gruber2015-11-241-0/+3
| | |/ / / / / /
| * | | | | | | Merge branch 'cb/ssl-config-pathnames' into maintJeff King2015-12-011-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | http: treat config options sslCAPath and sslCAInfo as pathscb/ssl-config-pathnamesCharles Bailey2015-11-241-2/+2
| | |/ / / / / /
| * | | | | | | Merge branch 'dk/t5813-unc-paths' into maintJeff King2015-12-011-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | t5813: avoid creating urls that break on cygwindk/t5813-unc-pathsDennis Kaarsemaker2015-11-201-2/+2
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'dk/rerere-train-quoting' into maintJeff King2015-12-011-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Escape Git's exec path in contrib/rerere-train.sh scriptdk/rerere-train-quotingDaniel Knittl-Frank2015-11-201-1/+1
| | |/ / / / / /
| * | | | | | | Merge branch 'cb/hook-sigpipe' into maintJeff King2015-12-013-20/+27
| |\ \ \ \ \ \ \
| | * | | | | | | allow hooks to ignore their standard input streamcb/hook-sigpipeClemens Buchacher2015-11-163-20/+27
| | |/ / / / / /
| * | | | | | | Merge branch 'fm/shell-path-whitespace' into maintJeff King2015-12-011-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | rebase-i-exec: Allow space in SHELL_PATHfm/shell-path-whitespaceFredrik Medley2015-11-131-1/+1
| | |/ / / / / /
| * | | | | | | Merge branch 'ar/doc-env-variable-format' into maintJeff King2015-12-011-6/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Documentation: make environment variable formatting more consistentar/doc-env-variable-formatАндрей Рыбак2015-11-111-6/+6
| | |/ / / / / /
| * | | | | | | Merge branch 'pt/http-socks-proxy' into maintJeff King2015-12-011-0/+11
| |\ \ \ \ \ \ \
| | * | | | | | | remote-http(s): support SOCKS proxiespt/http-socks-proxyPat Thoyts2015-11-201-0/+11
| * | | | | | | | Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maintJeff King2015-12-011-1/+7
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fp/subtree-todo-update'Jeff King2015-11-241-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | contrib/subtree: remove "push" command from the "todo" filefp/subtree-todo-updateFabio Porcedda2015-11-061-2/+0
* | | | | | | | | | Merge branch 'rc/configure-use-libs-when-checking-a-lib'Jeff King2015-11-241-1/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | configure.ac: use $LIBS not $CFLAGS when testing -lpthreadrc/configure-use-libs-when-checking-a-libRainer M. Canavan2015-11-061-1/+7
* | | | | | | | | | Merge branch 'maint'Jeff King2015-11-241-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Documentation/git-update-index: add missing opts to synopsysChristian Couder2015-11-241-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svnJeff King2015-11-201-8/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-svn: improve rebase/mkdirs performanceDair Grant2015-11-101-8/+76
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'lf/ref-is-hidden-namespace'Jeff King2015-11-206-15/+100
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5509: add basic tests for hideRefslf/ref-is-hidden-namespaceLukas Fleischer2015-11-051-0/+41
| * | | | | | | | | hideRefs: add support for matching full refsLukas Fleischer2015-11-055-16/+52
View Lorry Controller Status