summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diffcore-rename: make diff-tree -l0 mean -l<large>en/rename-progressJonathan Tan2017-12-022-0/+17
* sequencer: show rename progress during cherry picksElijah Newren2017-11-151-0/+1
* diff: remove silent clamp of renameLimitElijah Newren2017-11-152-8/+5
* progress: fix progress meters when dealing with lots of workElijah Newren2017-11-153-20/+21
* sequencer: warn when internal merge may be suboptimal due to renameLimitElijah Newren2017-11-141-0/+1
* Merge branch 'jm/status-ignored-files-list'Junio C Hamano2017-11-138-18/+360
|\
| * status: test ignored modesjm/status-ignored-files-listJameson Miller2017-10-311-0/+233
| * status: document options to show matching ignored filesJameson Miller2017-10-312-5/+43
| * status: report matching ignored and normal untrackedJameson Miller2017-10-311-2/+18
| * status: add option to show ignored files differentlyJameson Miller2017-10-315-11/+66
* | RelNotes: the third batch for 2.16Junio C Hamano2017-11-091-0/+40
* | Merge branch 'js/mingw-redirect-std-handles'Junio C Hamano2017-11-093-0/+88
|\ \
| * | mingw: document the standard handle redirectionjs/mingw-redirect-std-handlesJohannes Schindelin2017-11-021-0/+18
| * | mingw: optionally redirect stderr/stdout via the same handleJohannes Schindelin2017-11-022-1/+22
| * | mingw: add experimental feature to redirect standard handlesJohannes Schindelin2017-11-022-0/+49
* | | Merge branch 'js/wincred-empty-cred'Junio C Hamano2017-11-092-2/+27
|\ \ \
| * | | wincred: handle empty username/password correctlyjs/wincred-empty-credJakub Bereżański2017-11-011-2/+8
| * | | t0302: check helper can handle empty credentialsJakub Bereżański2017-11-011-0/+19
| |/ /
* | | Merge branch 'js/mingw-full-version-in-resources'Junio C Hamano2017-11-092-3/+4
|\ \ \
| * | | mingw: include the full version information in the resourcesjs/mingw-full-version-in-resourcesJohannes Schindelin2017-11-012-3/+4
* | | | Merge branch 'dk/libsecret-unlock-to-load-fix'Junio C Hamano2017-11-091-1/+1
|\ \ \ \
| * | | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fixDennis Kaarsemaker2017-11-041-1/+1
* | | | | Merge branch 'ks/mailmap'Junio C Hamano2017-11-091-0/+1
|\ \ \ \ \
| * | | | | mailmap: use Kaartic Sivaraam's new addressks/mailmapKaartic Sivaraam2017-11-031-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'js/early-config'Junio C Hamano2017-11-091-1/+3
|\ \ \ \ \
| * | | | | setup: avoid double slashes when looking for HEADjs/early-configJeff King2017-11-031-1/+3
* | | | | | Merge branch 'sg/travis-fixes'Junio C Hamano2017-11-093-7/+13
|\ \ \ \ \ \
| * | | | | | travis-ci: don't build Git for the static analysis jobSZEDER Gábor2017-11-021-1/+1
| * | | | | | travis-ci: fix running P4 and Git LFS tests in Linux build jobsSZEDER Gábor2017-11-022-6/+12
* | | | | | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-0927-246/+260
|\ \ \ \ \ \ \
| * | | | | | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-0125-228/+228
| * | | | | | | diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-017-24/+22
| * | | | | | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-0120-91/+90
| * | | | | | | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-0117-84/+84
| * | | | | | | diff: remove touched flagsBrandon Williams2017-11-012-6/+2
| * | | | | | | diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-013-3/+5
| * | | | | | | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-016-49/+68
| * | | | | | | add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams2017-10-312-2/+2
* | | | | | | | Merge branch 'rs/hex-to-bytes-cleanup'Junio C Hamano2017-11-095-36/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file: use hex_to_bytes()rs/hex-to-bytes-cleanupRené Scharfe2017-11-011-13/+11
| * | | | | | | | http-push: use hex_to_bytes()René Scharfe2017-11-011-6/+4
| * | | | | | | | notes: move hex_to_bytes() to hex.c and export itRené Scharfe2017-11-013-17/+19
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ad/5580-unc-tests-on-cygwin'Junio C Hamano2017-11-091-4/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | t5580: add Cygwin supportad/5580-unc-tests-on-cygwinAdam Dinwoodie2017-11-011-4/+10
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix'Junio C Hamano2017-11-091-8/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: fix lstat() error handling in diff_populate_filespec()ao/diff-populate-filespec-lstat-errorpath-fixAndrey Okoshkin2017-10-291-8/+6
* | | | | | | | | Merge branch 'sb/blame-config-doc'Junio C Hamano2017-11-091-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config: document blame configurationsb/blame-config-docStefan Beller2017-11-061-0/+17
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jm/relnotes-2.15-typofix'Junio C Hamano2017-11-091-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix typos in 2.15.0 release notesjm/relnotes-2.15-typofixJean Carlo Machado2017-11-061-3/+3
| | |_|/ / / / / / | |/| | | | | | |
View Lorry Controller Status