summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* verify_pack: do not ignore return value of verification functiondt/fsck-verify-pack-errorDavid Turner2015-12-011-1/+1
* 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | configure.ac: use $LIBS not $CFLAGS when testing -lpthreadrc/configure-use-libs-when-checking-a-libRainer M. Canavan2015-11-061-1/+7
* | | | | | Documentation/git-update-index: add missing opts to synopsysChristian Couder2015-11-241-0/+1
| |_|/ / / |/| | | |
* | | | | Git 2.6.3v2.6.3Junio C Hamano2015-11-054-3/+115
* | | | | Merge branch 'rs/daemon-plug-child-leak' into maintJunio C Hamano2015-11-054-6/+18
|\ \ \ \ \
| * | | | | daemon: plug memory leakrs/daemon-plug-child-leakRené Scharfe2015-11-021-0/+1
| * | | | | run-command: factor out child_process_clear()René Scharfe2015-11-023-6/+17
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-052-35/+43
|\ \ \ \ \
| * | | | | wt-status: use skip_prefix() to get rid of magic string length constantsrs/wt-status-detached-branch-fixRené Scharfe2015-11-011-21/+15
| * | | | | wt-status: don't skip a magical number of characters blindlyRené Scharfe2015-11-011-1/+1
| * | | | | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-012-7/+10
| * | | | | wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe2015-11-011-8/+5
| * | | | | t7060: add test for status --branch on a detached HEADRené Scharfe2015-11-011-0/+14
* | | | | | Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maintJunio C Hamano2015-11-051-1/+1
|\ \ \ \ \ \
| * | | | | | add_submodule_odb: initialize alt_odb list earlierjk/initialization-fix-to-add-submodule-odbJeff King2015-10-281-1/+1
* | | | | | | Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-055-6/+12
|\ \ \ \ \ \ \
| * | | | | | | Correct fscanf formatting string for I64u valuesjs/misc-fixesWaldek Maleska2015-10-262-1/+5
| * | | | | | | Silence GCC's "cast of pointer to integer of a different size" warningJohannes Schindelin2015-10-263-4/+6
| * | | | | | | Squelch warning about an integer overflowJohannes Schindelin2015-10-261-1/+1
* | | | | | | | Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-053-7/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | add: simplify -u/-A without pathspecjc/add-u-A-default-to-topJunio C Hamano2015-10-243-7/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-055-89/+144
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: detect delete/modechange conflictjk/delete-modechange-conflictJeff King2015-10-263-2/+37
View Lorry Controller Status