Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bisect: mention "view" as an alternative to "visualize"rd/bisect-view-is-visualize | Robert P. J. Day | 2017-11-13 | 3 | -10/+9 |
* | RelNotes: the third batch for 2.16 | Junio C Hamano | 2017-11-09 | 1 | -0/+40 |
* | Merge branch 'js/mingw-redirect-std-handles' | Junio C Hamano | 2017-11-09 | 3 | -0/+88 |
|\ | |||||
| * | mingw: document the standard handle redirectionjs/mingw-redirect-std-handles | Johannes Schindelin | 2017-11-02 | 1 | -0/+18 |
| * | mingw: optionally redirect stderr/stdout via the same handle | Johannes Schindelin | 2017-11-02 | 2 | -1/+22 |
| * | mingw: add experimental feature to redirect standard handles | Johannes Schindelin | 2017-11-02 | 2 | -0/+49 |
* | | Merge branch 'js/wincred-empty-cred' | Junio C Hamano | 2017-11-09 | 2 | -2/+27 |
|\ \ | |||||
| * | | wincred: handle empty username/password correctlyjs/wincred-empty-cred | Jakub Bereżański | 2017-11-01 | 1 | -2/+8 |
| * | | t0302: check helper can handle empty credentials | Jakub Bereżański | 2017-11-01 | 1 | -0/+19 |
| |/ | |||||
* | | Merge branch 'js/mingw-full-version-in-resources' | Junio C Hamano | 2017-11-09 | 2 | -3/+4 |
|\ \ | |||||
| * | | mingw: include the full version information in the resourcesjs/mingw-full-version-in-resources | Johannes Schindelin | 2017-11-01 | 2 | -3/+4 |
* | | | Merge branch 'dk/libsecret-unlock-to-load-fix' | Junio C Hamano | 2017-11-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fix | Dennis Kaarsemaker | 2017-11-04 | 1 | -1/+1 |
* | | | | Merge branch 'ks/mailmap' | Junio C Hamano | 2017-11-09 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | mailmap: use Kaartic Sivaraam's new addressks/mailmap | Kaartic Sivaraam | 2017-11-03 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'js/early-config' | Junio C Hamano | 2017-11-09 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | setup: avoid double slashes when looking for HEADjs/early-config | Jeff King | 2017-11-03 | 1 | -1/+3 |
* | | | | | Merge branch 'sg/travis-fixes' | Junio C Hamano | 2017-11-09 | 3 | -7/+13 |
|\ \ \ \ \ | |||||
| * | | | | | travis-ci: don't build Git for the static analysis job | SZEDER Gábor | 2017-11-02 | 1 | -1/+1 |
| * | | | | | travis-ci: fix running P4 and Git LFS tests in Linux build jobs | SZEDER Gábor | 2017-11-02 | 2 | -6/+12 |
* | | | | | | Merge branch 'bw/diff-opt-impl-to-bitfields' | Junio C Hamano | 2017-11-09 | 27 | -246/+260 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfields | Brandon Williams | 2017-11-01 | 25 | -228/+228 |
| * | | | | | | diff: remove DIFF_OPT_CLR macro | Brandon Williams | 2017-11-01 | 7 | -24/+22 |
| * | | | | | | diff: remove DIFF_OPT_SET macro | Brandon Williams | 2017-11-01 | 20 | -91/+90 |
| * | | | | | | diff: remove DIFF_OPT_TST macro | Brandon Williams | 2017-11-01 | 17 | -84/+84 |
| * | | | | | | diff: remove touched flags | Brandon Williams | 2017-11-01 | 2 | -6/+2 |
| * | | | | | | diff: add flag to indicate textconv was set via cmdline | Brandon Williams | 2017-11-01 | 3 | -3/+5 |
| * | | | | | | diff: convert flags to be stored in bitfields | Brandon Williams | 2017-11-01 | 6 | -49/+68 |
| * | | | | | | add, reset: use DIFF_OPT_SET macro to set a diff flag | Brandon Williams | 2017-10-31 | 2 | -2/+2 |
* | | | | | | | Merge branch 'rs/hex-to-bytes-cleanup' | Junio C Hamano | 2017-11-09 | 5 | -36/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_file: use hex_to_bytes()rs/hex-to-bytes-cleanup | René Scharfe | 2017-11-01 | 1 | -13/+11 |
| * | | | | | | | http-push: use hex_to_bytes() | René Scharfe | 2017-11-01 | 1 | -6/+4 |
| * | | | | | | | notes: move hex_to_bytes() to hex.c and export it | René Scharfe | 2017-11-01 | 3 | -17/+19 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ad/5580-unc-tests-on-cygwin' | Junio C Hamano | 2017-11-09 | 1 | -4/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t5580: add Cygwin supportad/5580-unc-tests-on-cygwin | Adam Dinwoodie | 2017-11-01 | 1 | -4/+10 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' | Junio C Hamano | 2017-11-09 | 1 | -8/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff: fix lstat() error handling in diff_populate_filespec()ao/diff-populate-filespec-lstat-errorpath-fix | Andrey Okoshkin | 2017-10-29 | 1 | -8/+6 |
* | | | | | | | | Merge branch 'sb/blame-config-doc' | Junio C Hamano | 2017-11-09 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config: document blame configurationsb/blame-config-doc | Stefan Beller | 2017-11-06 | 1 | -0/+17 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jm/relnotes-2.15-typofix' | Junio C Hamano | 2017-11-09 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix typos in 2.15.0 release notesjm/relnotes-2.15-typofix | Jean Carlo Machado | 2017-11-06 | 1 | -3/+3 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | RelNotes: the second batch post 2.15 comes | Junio C Hamano | 2017-11-06 | 2 | -4/+46 |
* | | | | | | | | Merge branch 'tg/deprecate-stash-save' | Junio C Hamano | 2017-11-06 | 4 | -23/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | stash: remove now superfluos help for "stash push" | Thomas Gummerer | 2017-10-27 | 1 | -12/+1 |
| * | | | | | | | | stash: mark "git stash save" deprecated in the man page | Thomas Gummerer | 2017-10-27 | 1 | -3/+6 |
| * | | | | | | | | stash: replace "git stash save" with "git stash push" in the documentation | Thomas Gummerer | 2017-10-27 | 4 | -13/+13 |
* | | | | | | | | | Merge branch 'tb/complete-checkout' | Junio C Hamano | 2017-11-06 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | completion: add remaining flags to checkouttb/complete-checkout | Thomas Braun | 2017-10-25 | 2 | -1/+6 |
* | | | | | | | | | | Merge branch 'gc/gitweb-filetest-acl' | Junio C Hamano | 2017-11-06 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gitweb: use filetest to allow ACLsgc/gitweb-filetest-acl | Guillaume Castagnino | 2017-10-24 | 1 | -0/+2 |
| | |_|_|/ / / / / / | |/| | | | | | | | |