git, branch v2.19.0-rc0

Git 2.19-rc0

2018-08-20T19:53:58Z

Signed-off-by: Junio C Hamano

Merge branch 'ab/checkout-default-remote'

2018-08-20T19:53:46Z

* ab/checkout-default-remote: t2024: mark test using "checkout -p" with PERL prerequisite

Merge branch 'hn/highlight-sideband-keywords'

2018-08-20T19:41:34Z

The sideband code learned to optionally paint selected keywords at the beginning of incoming lines on the receiving end. * hn/highlight-sideband-keywords: sideband: do not read beyond the end of input sideband: highlight keywords in remote sideband output

Merge branch 'nd/cherry-pick-quit-fix'

2018-08-20T19:41:34Z

"git cherry-pick --quit" failed to remove CHERRY_PICK_HEAD even though we won't be in a cherry-pick session after it returns, which has been corrected. * nd/cherry-pick-quit-fix: cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD

Merge branch 'sb/submodule-cleanup'

2018-08-20T19:41:33Z

A few preliminary minor clean-ups in the area around submodules. * sb/submodule-cleanup: builtin/submodule--helper: remove stray new line t7410: update to new style

Merge branch 'pw/rebase-i-merge-segv-fix'

2018-08-20T19:41:33Z

"git rebase -i", when a 'merge ' insn in its todo list fails, segfaulted, which has been (minimally) corrected. * pw/rebase-i-merge-segv-fix: rebase -i: fix SIGSEGV when 'merge ' fails t3430: add conflicting commit

Merge branch 'pw/rebase-i-squash-number-fix'

2018-08-20T19:41:33Z

When "git rebase -i" is told to squash two or more commits into one, it labeled the log message for each commit with its number. It correctly called the first one "1st commit", but the next one was "commit #1", which was off-by-one. This has been corrected. * pw/rebase-i-squash-number-fix: rebase -i: fix numbering in squash message

Merge branch 'sb/config-write-fix'

2018-08-20T19:41:32Z

Recent update to "git config" broke updating variable in a subsection, which has been corrected. * sb/config-write-fix: git-config: document accidental multi-line setting in deprecated syntax config: fix case sensitive subsection names on writing t1300: document current behavior of setting options

Merge branch 'ab/submodule-relative-url-tests'

2018-08-20T19:41:32Z

Test updates. * ab/submodule-relative-url-tests: submodule: add more exhaustive up-path testing

Merge branch 'en/incl-forward-decl'

2018-08-20T19:41:32Z

Code hygiene improvement for the header files. * en/incl-forward-decl: Remove forward declaration of an enum compat/precompose_utf8.h: use more common include guard style urlmatch.h: fix include guard Move definition of enum branch_track from cache.h to branch.h alloc: make allocate_alloc_state and clear_alloc_state more consistent Add missing includes and forward declarations