summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: ignore_case shouldn't reject intentional removalsen/merge-recursive-icase-removalElijah Newren2017-11-271-1/+1
* RelNotes: minor typo fixes in 2.15.1 draftTodd Zullinger2017-11-261-3/+3
* Almost ready for 2.15.1Junio C Hamano2017-11-211-0/+12
* Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintJunio C Hamano2017-11-211-29/+16
|\
| * sequencer.c: check return value of close() in rewrite_file()rs/sequencer-rewrite-file-cleanupSimon Ruderich2017-11-021-1/+2
| * sequencer: use O_TRUNC to truncate filesRené Scharfe2017-11-011-3/+1
| * sequencer: factor out rewrite_file()René Scharfe2017-11-011-29/+17
* | Merge branch 'cb/t4201-robustify' into maintJunio C Hamano2017-11-212-5/+7
|\ \
| * | t4201: make use of abbreviation in the test more robustcb/t4201-robustifyCharles Bailey2017-11-132-5/+7
* | | Merge branch 'tz/fsf-address-update' into maintJunio C Hamano2017-11-2144-103/+69
|\ \ \
| * \ \ Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-updatetz/fsf-address-updateJunio C Hamano2017-11-091-2/+1
| |\ \ \
| | * | | Replace Free Software Foundation address in license noticesTodd Zullinger2017-11-091-2/+1
| * | | | Replace Free Software Foundation address in license noticesTodd Zullinger2017-11-0943-101/+68
| | |_|/ | |/| |
* | | | Merge branch 'ad/rebase-i-serie-typofix' into maintJunio C Hamano2017-11-211-1/+1
|\ \ \ \
| * | | | rebase -i: fix comment typoad/rebase-i-serie-typofixAdam Dinwoodie2017-11-091-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano2017-11-211-1/+3
|\ \ \ \
| * | | | link_alt_odb_entries: make empty input a noopjk/info-alternates-fixJeff King2017-11-131-1/+3
* | | | | Merge branch 'ab/pcre-v2' into maintJunio C Hamano2017-11-212-3/+4
|\ \ \ \ \
| * | | | | grep: fix NO_LIBPCRE1_JIT to fully disable JITCharles Bailey2017-11-132-3/+4
* | | | | | Merge branch 'sr/wrapper-quote-filenames' into maintJunio C Hamano2017-11-213-6/+6
|\ \ \ \ \ \
| * | | | | | wrapper.c: consistently quote filenames in error messagessr/wrapper-quote-filenamesSimon Ruderich2017-11-063-6/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bw/rebase-i-ignored-submodule-fix' into maintJunio C Hamano2017-11-212-1/+20
|\ \ \ \ \ \
| * | | | | | wt-status: actually ignore submodules when requestedbw/status-ignore-submodules-from-configbw/rebase-i-ignored-submodule-fixBrandon Williams2017-11-072-1/+20
* | | | | | | Start preparation for 2.15.1Junio C Hamano2017-11-153-2/+70
* | | | | | | Merge branch 'ks/mailmap' into maintJunio C Hamano2017-11-151-0/+1
|\ \ \ \ \ \ \
| * | | | | | | mailmap: use Kaartic Sivaraam's new addressks/mailmapKaartic Sivaraam2017-11-031-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jm/relnotes-2.15-typofix' into maintJunio C Hamano2017-11-151-3/+3
|\ \ \ \ \ \ \
| * | | | | | | fix typos in 2.15.0 release notesjm/relnotes-2.15-typofixJean Carlo Machado2017-11-061-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintJunio C Hamano2017-11-154-9/+6
|\ \ \ \ \ \ \
| * | | | | | | diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimentalCarlos Martín Nieto2017-11-024-9/+6
* | | | | | | | Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano2017-11-153-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' into maintJunio C Hamano2017-11-152-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' into maintJunio C Hamano2017-11-152-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' into maintJunio C Hamano2017-11-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fixDennis Kaarsemaker2017-11-041-1/+1
* | | | | | | | | Merge branch 'js/early-config' into maintJunio C Hamano2017-11-151-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | setup: avoid double slashes when looking for HEADjs/early-configJeff King2017-11-031-1/+3
* | | | | | | | | | Merge branch 'ad/5580-unc-tests-on-cygwin' into maintJunio C Hamano2017-11-151-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' into maintJunio C Hamano2017-11-151-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' into maintJunio C Hamano2017-11-151-0/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: document blame configurationsb/blame-config-docStefan Beller2017-11-061-0/+17
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tb/complete-checkout' into maintJunio C Hamano2017-11-152-1/+6
|\ \ \ \ \ \ \ \ \ \ \