summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4 tests: time_in_seconds should use $PYTHON_PATHld/p4-test-py3Luke Diamand2016-04-261-1/+1
* git-p4 tests: work with python3 as well as python2Luke Diamand2016-04-262-5/+6
* git-p4 tests: cd to / before running pythonLuke Diamand2016-04-261-1/+1
* Prepare for 2.8.2Junio C Hamano2016-04-141-0/+38
* Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-142-5/+15
|\
| * merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-232-5/+15
* | Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-142-1/+38
|\ \
| * | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-212-1/+38
* | | Merge branch 'jk/send-email-rtrim-mailrc-alias' into maintJunio C Hamano2016-04-141-1/+1
|\ \ \
| * | | send-email: ignore trailing whitespace in mailrc alias filejk/send-email-rtrim-mailrc-aliasJeff King2016-03-181-1/+1
* | | | Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-142-4/+85
|\ \ \ \
| * | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-102-1/+35
| * | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-102-3/+50
* | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-1413-26/+54
|\ \ \ \ \
| * | | | | use setup_git_directory() in test-* programsjk/startup-infoJeff King2016-03-072-0/+4
| * | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-072-2/+31
| * | | | | mailmap: do not resolve blobs in a non-repositoryJeff King2016-03-061-1/+2
| * | | | | remote: don't resolve HEAD in non-repositoryJeff King2016-03-061-5/+6
| * | | | | setup: set startup_info->have_repository more reliablyJeff King2016-03-062-1/+4
| * | | | | setup: make startup_info available everywhereJeff King2016-03-066-17/+7
* | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-142-1/+11
|\ \ \ \ \ \
| * | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-emptyJeff King2016-03-052-1/+11
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintJunio C Hamano2016-04-141-1/+2
|\ \ \ \ \ \
| * | | | | | xdiff/xprepare: fix a memory leakrj/xdiff-prepare-plug-leak-on-error-codepathRamsay Jones2016-03-041-0/+1
| * | | | | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones2016-03-041-1/+1
* | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-143-3/+31
|\ \ \ \ \ \ \
| * | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsgf/fetch-pack-direct-object-fetchGabriel Souza Franco2016-03-051-0/+4
| * | | | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-012-3/+27
* | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-142-18/+77
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-varsJeff King2016-02-292-20/+34
| * | | | | | | | t1515: add tests for rev-parse out-of-repo helpersJeff King2016-02-281-0/+45
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-143-11/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/git-config: fix --get-all descriptionjk/config-get-urlmatchJohn Keeping2016-02-281-2/+1
| * | | | | | | | Documentation/git-config: use bulleted list for exit codesJohn Keeping2016-02-281-7/+7
| * | | | | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-283-2/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano2016-04-141-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | t/t7502 : drop duplicate testpb/t7502-drop-dupPranit Bauva2016-03-111-5/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano2016-04-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envjk/test-httpd-config-nosystemJeff King2016-03-181-0/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano2016-04-1410-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | clone tests: rename t57* => t56*sb/clone-t57-t56Stefan Beller2016-03-1610-0/+0
* | | | | | | | | Merge branch 'jk/credential-cache-comment-exit' into maintJunio C Hamano2016-04-141-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | credential-cache--daemon: clarify "exit" action semanticsjk/credential-cache-comment-exitJeff King2016-03-181-1/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-142-18/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: add a helper function to derive .idx/.keep filenamejc/index-packJunio C Hamano2016-03-031-18/+17
| * | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-032-1/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keepJunio C Hamano2016-03-032-1/+7
* | | | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maintJunio C Hamano2016-04-143-9/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | dir: store EXC_FLAG_* values in unsigned integersss/exc-flag-is-a-collection-of-bitsSaurav Sachidanand2016-03-013-9/+9
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mp/upload-pack-use-embedded-args' into maintJunio C Hamano2016-04-141-14/+11
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status