summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* grep: show non-empty lines before functions with -Wrs/include-comments-before-the-function-headerRené Scharfe2017-11-212-5/+24
* grep: update boundary variable for pre-contextRené Scharfe2017-11-211-6/+8
* t7810: improve check of -W with user-defined function linesRené Scharfe2017-11-211-10/+31
* xdiff: show non-empty lines before functions with -WRené Scharfe2017-11-212-1/+4
* xdiff: factor out is_func_rec()René Scharfe2017-11-211-3/+7
* t4051: add test for comments preceding function linesRené Scharfe2017-11-212-0/+7
* Sync with maintJunio C Hamano2017-11-151-0/+68
|\
| * Start preparation for 2.15.1Junio C Hamano2017-11-153-2/+70
| * Merge branch 'ks/mailmap' into maintJunio C Hamano2017-11-151-0/+1
| |\
| * \ Merge branch 'jm/relnotes-2.15-typofix' into maintJunio C Hamano2017-11-151-3/+3
| |\ \
| * \ \ Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintJunio C Hamano2017-11-154-9/+6
| |\ \ \
| * \ \ \ Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano2017-11-153-0/+88
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/wincred-empty-cred' into maintJunio C Hamano2017-11-152-2/+27
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/mingw-full-version-in-resources' into maintJunio C Hamano2017-11-152-3/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dk/libsecret-unlock-to-load-fix' into maintJunio C Hamano2017-11-151-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'js/early-config' into maintJunio C Hamano2017-11-151-1/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ad/5580-unc-tests-on-cygwin' into maintJunio C Hamano2017-11-151-4/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maintJunio C Hamano2017-11-151-8/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/blame-config-doc' into maintJunio C Hamano2017-11-151-0/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/complete-checkout' into maintJunio C Hamano2017-11-152-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano2017-11-154-4/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t5601-copy-workaround' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2017-11-152-1/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/grep-recurse-submodules' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/submodule-in-excluded' into maintJunio C Hamano2017-11-152-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ao/check-resolve-ref-unsafe-result' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maintJunio C Hamano2017-11-154-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maintJunio C Hamano2017-11-153-78/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-color-moved-fix' into maintJunio C Hamano2017-11-152-42/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kd/auto-col-with-pager-fix' into maintJunio C Hamano2017-11-152-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/travis-fixes' into maintJunio C Hamano2017-11-153-7/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | RelNotes: the fourth batch for 2.16Junio C Hamano2017-11-151-24/+69
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bp/read-index-from-skip-verification'Junio C Hamano2017-11-153-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | read_index_from(): speed index loading by skipping verification of the entry ...bp/read-index-from-skip-verificationBen Peart2017-11-083-0/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc'Junio C Hamano2017-11-153-161/+192
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: convert SubmittingPatches to AsciiDocbrian m. carlson2017-11-133-161/+191
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: enable compat-mode for Asciidoctorbrian m. carlson2017-10-301-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/bisect-run-empty'Junio C Hamano2017-11-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | bisect run: die if no command is givensb/bisect-run-emptyStephan Beyer2017-11-131-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd/bisect-view-is-visualize'Junio C Hamano2017-11-153-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | bisect: mention "view" as an alternative to "visualize"rd/bisect-view-is-visualizeRobert P. J. Day2017-11-133-10/+9
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/info-alternates-fix'Junio C Hamano2017-11-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | link_alt_odb_entries: make empty input a noopjk/info-alternates-fixJeff King2017-11-131-1/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/t4201-robustify'Junio C Hamano2017-11-152-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4201: make use of abbreviation in the test more robustcb/t4201-robustifyCharles Bailey2017-11-132-5/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-11-152-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: fix NO_LIBPCRE1_JIT to fully disable JITCharles Bailey2017-11-132-3/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz/fsf-address-update'Junio C Hamano2017-11-1544-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