summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t: send verbose test-helper output to fd 4jk/test-helper-v-output-fixJeff King2018-02-221-10/+10
* Fourth batch for 2.17Junio C Hamano2018-02-211-0/+12
* Merge branch 'sg/test-i18ngrep'Junio C Hamano2018-02-218-43/+72
|\
| * t: make 'test_i18ngrep' more informative on failuresg/test-i18ngrepSZEDER Gábor2018-02-081-4/+20
| * t: validate 'test_i18ngrep's parametersSZEDER Gábor2018-02-081-0/+12
| * t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'SZEDER Gábor2018-02-082-26/+26
| * t5536: let 'test_i18ngrep' read the file without redirectionSZEDER Gábor2018-02-081-1/+1
| * t5510: consolidate 'grep' and 'test_i18ngrep' patternsSZEDER Gábor2018-02-081-6/+3
| * t4001: don't run 'git status' upstream of a pipeSZEDER Gábor2018-02-081-3/+8
| * t6022: don't run 'git merge' upstream of a pipeSZEDER Gábor2018-02-081-2/+4
| * t5812: add 'test_i18ngrep's missing filename parameterSZEDER Gábor2018-02-081-4/+1
| * t5541: add 'test_i18ngrep's missing filename parameterSZEDER Gábor2018-02-081-1/+1
* | Merge branch 'gs/rebase-allow-empty-message'Junio C Hamano2018-02-217-11/+53
|\ \
| * | rebase: add --allow-empty-message optiongs/rebase-allow-empty-messageGenki Sky2018-02-077-11/+53
* | | Merge branch 'lw/daemon-log-destination'Junio C Hamano2018-02-212-10/+64
|\ \ \
| * | | daemon: add --log-destination=(stderr|syslog|none)lw/daemon-log-destinationLucas Werkmeister2018-02-052-10/+64
| | |/ | |/|
* | | Merge branch 'nd/format-patch-stat-width'Junio C Hamano2018-02-212-16/+37
|\ \ \
| * | | format-patch: reduce patch diffstat width to 72nd/format-patch-stat-widthNguyễn Thái Ngọc Duy2018-02-022-15/+33
| * | | format-patch: keep cover-letter diffstat wrapped in 72 columnsNguyễn Thái Ngọc Duy2018-01-251-1/+4
| | |/ | |/|
* | | Sync with 2.16.2Junio C Hamano2018-02-151-0/+30
|\ \ \
| * | | Git 2.16.2v2.16.2Junio C Hamano2018-02-153-2/+32
| * | | Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maintJunio C Hamano2018-02-151-3/+4
| |\ \ \
| * \ \ \ Merge branch 'as/read-tree-prefix-doc-fix' into maintJunio C Hamano2018-02-151-3/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/add-i-ignore-submodules' into maintJunio C Hamano2018-02-152-1/+49
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tg/stash-with-pathspec-fix' into maintJunio C Hamano2018-02-152-3/+34
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2018-02-152-33/+98
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano2018-02-152-4/+45
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/lose-leak-pending' into maintJunio C Hamano2018-02-1510-86/+46
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jm/svn-pushmergeinfo-fix' into maintJunio C Hamano2018-02-151-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/describe-all-output-fix' into maintJunio C Hamano2018-02-152-3/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/perf-grep-threads' into maintJunio C Hamano2018-02-152-21/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Third batch for 2.17Junio C Hamano2018-02-151-0/+26
* | | | | | | | | | | | | Merge branch 'bc/hash-algo'Junio C Hamano2018-02-1515-344/+348
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | hash: update obsolete reference to SHA1_HEADERbc/hash-algobrian m. carlson2018-02-091-2/+2
| * | | | | | | | | | | | | bulk-checkin: abstract SHA-1 usagebrian m. carlson2018-02-021-6/+6
| * | | | | | | | | | | | | csum-file: abstract uses of SHA-1brian m. carlson2018-02-022-7/+7
| * | | | | | | | | | | | | csum-file: rename sha1file to hashfilebrian m. carlson2018-02-029-126/+126
| * | | | | | | | | | | | | read-cache: abstract away uses of SHA-1brian m. carlson2018-02-021-29/+29
| * | | | | | | | | | | | | pack-write: switch various SHA-1 values to abstract formsbrian m. carlson2018-02-021-24/+25
| * | | | | | | | | | | | | pack-check: convert various uses of SHA-1 to abstract formsbrian m. carlson2018-02-021-16/+16
| * | | | | | | | | | | | | fast-import: switch various uses of SHA-1 to the_hash_algobrian m. carlson2018-02-021-20/+22
| * | | | | | | | | | | | | sha1_file: switch uses of SHA-1 to the_hash_algobrian m. carlson2018-02-021-26/+26
| * | | | | | | | | | | | | builtin/unpack-objects: switch uses of SHA-1 to the_hash_algobrian m. carlson2018-02-021-9/+9
| * | | | | | | | | | | | | builtin/index-pack: improve hash function abstractionbrian m. carlson2018-02-021-45/+45
| * | | | | | | | | | | | | hash: create union for hash context allocationbrian m. carlson2018-02-022-17/+18
| * | | | | | | | | | | | | hash: move SHA-1 macros to hash.hbrian m. carlson2018-02-022-25/+25
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/ignore-glob-doc-update'Junio C Hamano2018-02-151-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitignore.txt: elaborate shell glob syntaxnd/ignore-glob-doc-updateDuy Nguyen2018-02-021-6/+5
* | | | | | | | | | | | | | Merge branch 'tg/reset-hard-show-head-with-pretty'Junio C Hamano2018-02-151-18/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | reset --hard: make use of the pretty machinerytg/reset-hard-show-head-with-prettyThomas Gummerer2018-02-021-18/+10
View Lorry Controller Status