Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | grep: show non-empty lines before functions with -Wrs/include-comments-before-the-function-header | René Scharfe | 2017-11-21 | 2 | -5/+24 |
* | grep: update boundary variable for pre-context | René Scharfe | 2017-11-21 | 1 | -6/+8 |
* | t7810: improve check of -W with user-defined function lines | René Scharfe | 2017-11-21 | 1 | -10/+31 |
* | xdiff: show non-empty lines before functions with -W | René Scharfe | 2017-11-21 | 2 | -1/+4 |
* | xdiff: factor out is_func_rec() | René Scharfe | 2017-11-21 | 1 | -3/+7 |
* | t4051: add test for comments preceding function lines | René Scharfe | 2017-11-21 | 2 | -0/+7 |
* | Sync with maint | Junio C Hamano | 2017-11-15 | 1 | -0/+68 |
|\ | |||||
| * | 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 |
| |\ | |||||
| * \ | Merge branch 'jm/relnotes-2.15-typofix' into maint | Junio C Hamano | 2017-11-15 | 1 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint | Junio C Hamano | 2017-11-15 | 4 | -9/+6 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'js/mingw-redirect-std-handles' into maint | Junio C Hamano | 2017-11-15 | 3 | -0/+88 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'js/wincred-empty-cred' into maint | Junio C Hamano | 2017-11-15 | 2 | -2/+27 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'js/mingw-full-version-in-resources' into maint | Junio C Hamano | 2017-11-15 | 2 | -3/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dk/libsecret-unlock-to-load-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'js/early-config' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ad/5580-unc-tests-on-cygwin' into maint | Junio C Hamano | 2017-11-15 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -8/+6 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/blame-config-doc' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/complete-checkout' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/check-ref-format-oor' into maint | Junio C Hamano | 2017-11-15 | 4 | -4/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/t5601-copy-workaround' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/grep-recurse-submodules' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/submodule-in-excluded' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ao/check-resolve-ref-unsafe-result' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maint | Junio C Hamano | 2017-11-15 | 4 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maint | Junio C Hamano | 2017-11-15 | 3 | -78/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/diff-color-moved-fix' into maint | Junio C Hamano | 2017-11-15 | 2 | -42/+188 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kd/auto-col-with-pager-fix' into maint | Junio C Hamano | 2017-11-15 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/travis-fixes' into maint | Junio C Hamano | 2017-11-15 | 3 | -7/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | RelNotes: the fourth batch for 2.16 | Junio C Hamano | 2017-11-15 | 1 | -24/+69 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bp/read-index-from-skip-verification' | Junio C Hamano | 2017-11-15 | 3 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | read_index_from(): speed index loading by skipping verification of the entry ...bp/read-index-from-skip-verification | Ben Peart | 2017-11-08 | 3 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc' | Junio C Hamano | 2017-11-15 | 3 | -161/+192 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: convert SubmittingPatches to AsciiDoc | brian m. carlson | 2017-11-13 | 3 | -161/+191 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: enable compat-mode for Asciidoctor | brian m. carlson | 2017-10-30 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/bisect-run-empty' | Junio C Hamano | 2017-11-15 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | bisect run: die if no command is givensb/bisect-run-empty | Stephan Beyer | 2017-11-13 | 1 | -0/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rd/bisect-view-is-visualize' | Junio C Hamano | 2017-11-15 | 3 | -10/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | bisect: mention "view" as an alternative to "visualize"rd/bisect-view-is-visualize | Robert P. J. Day | 2017-11-13 | 3 | -10/+9 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/info-alternates-fix' | Junio C Hamano | 2017-11-15 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | link_alt_odb_entries: make empty input a noopjk/info-alternates-fix | Jeff King | 2017-11-13 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/t4201-robustify' | Junio C Hamano | 2017-11-15 | 2 | -5/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4201: make use of abbreviation in the test more robustcb/t4201-robustify | Charles Bailey | 2017-11-13 | 2 | -5/+7 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/pcre-v2' | Junio C Hamano | 2017-11-15 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grep: fix NO_LIBPCRE1_JIT to fully disable JIT | Charles Bailey | 2017-11-13 | 2 | -3/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tz/fsf-address-update' | Junio C Hamano | 2017-11-15 | 44 | -103/+69 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-updatetz/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 |