Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | RelNotes: minor typo fixes in 2.15.1 draft | Todd Zullinger | 2017-11-26 | 1 | -3/+3 | |
* | | | | | | | | | | | | Almost ready for 2.15.1 | Junio C Hamano | 2017-11-21 | 1 | -0/+12 | |
* | | | | | | | | | | | | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint | Junio C Hamano | 2017-11-21 | 1 | -29/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | sequencer.c: check return value of close() in rewrite_file() | Simon Ruderich | 2017-11-02 | 1 | -1/+2 | |
| * | | | | | | | | | | | | sequencer: use O_TRUNC to truncate files | René Scharfe | 2017-11-01 | 1 | -3/+1 | |
| * | | | | | | | | | | | | sequencer: factor out rewrite_file() | René Scharfe | 2017-11-01 | 1 | -29/+17 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'cb/t4201-robustify' into maint | Junio C Hamano | 2017-11-21 | 2 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t4201: make use of abbreviation in the test more robust | Charles Bailey | 2017-11-13 | 2 | -5/+7 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'tz/fsf-address-update' into maint | Junio C Hamano | 2017-11-21 | 44 | -103/+69 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update | Junio C Hamano | 2017-11-09 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Replace Free Software Foundation address in license notices | Todd Zullinger | 2017-11-09 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | Replace Free Software Foundation address in license notices | Todd Zullinger | 2017-11-09 | 43 | -101/+68 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ad/rebase-i-serie-typofix' into maint | Junio C Hamano | 2017-11-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | rebase -i: fix comment typo | Adam Dinwoodie | 2017-11-09 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/info-alternates-fix' into maint | Junio C Hamano | 2017-11-21 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | link_alt_odb_entries: make empty input a noop | Jeff King | 2017-11-13 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2' into maint | Junio C Hamano | 2017-11-21 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | grep: fix NO_LIBPCRE1_JIT to fully disable JIT | Charles Bailey | 2017-11-13 | 2 | -3/+4 | |
* | | | | | | | | | | | | | | | Merge branch 'sr/wrapper-quote-filenames' into maint | Junio C Hamano | 2017-11-21 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | wrapper.c: consistently quote filenames in error messages | Simon Ruderich | 2017-11-06 | 3 | -6/+6 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint | Junio C Hamano | 2017-11-21 | 2 | -1/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | wt-status: actually ignore submodules when requested | Brandon Williams | 2017-11-07 | 2 | -1/+20 | |
* | | | | | | | | | | | | | | | Start preparation for 2.15.1 | Junio C Hamano | 2017-11-15 | 3 | -2/+70 | |
* | | | | | | | | | | | | | | | Merge branch 'ks/mailmap' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | mailmap: use Kaartic Sivaraam's new address | Kaartic Sivaraam | 2017-11-03 | 1 | -0/+1 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'jm/relnotes-2.15-typofix' into maint | Junio C Hamano | 2017-11-15 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fix typos in 2.15.0 release notes | Jean Carlo Machado | 2017-11-06 | 1 | -3/+3 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint | Junio C Hamano | 2017-11-15 | 4 | -9/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | diff: --indent-heuristic is no longer experimental | Carlos Martín Nieto | 2017-11-02 | 4 | -9/+6 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'js/mingw-redirect-std-handles' into maint | Junio C Hamano | 2017-11-15 | 3 | -0/+88 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | mingw: document the standard handle redirection | 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' into maint | Junio C Hamano | 2017-11-15 | 2 | -2/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | wincred: handle empty username/password correctly | 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' into maint | Junio C Hamano | 2017-11-15 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | mingw: include the full version information in the resources | Johannes Schindelin | 2017-11-01 | 2 | -3/+4 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'dk/libsecret-unlock-to-load-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | credential-libsecret: unlock locked secrets | Dennis Kaarsemaker | 2017-11-04 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'js/early-config' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | setup: avoid double slashes when looking for HEAD | Jeff King | 2017-11-03 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | Merge branch 'ad/5580-unc-tests-on-cygwin' into maint | Junio C Hamano | 2017-11-15 | 1 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t5580: add Cygwin support | Adam Dinwoodie | 2017-11-01 | 1 | -4/+10 | |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -8/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | diff: fix lstat() error handling in diff_populate_filespec() | Andrey Okoshkin | 2017-10-29 | 1 | -8/+6 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'sb/blame-config-doc' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | config: document blame configuration | Stefan Beller | 2017-11-06 | 1 | -0/+17 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'tb/complete-checkout' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | completion: add remaining flags to checkout | Thomas Braun | 2017-10-25 | 2 | -1/+6 |