[Mesa-dev] [PATCH 01/26] docs: git tips

[Marek Olšák]

On Mon, Feb 29, 2016 at 2:17 AM, Timothy Arceri
<timothy.arceri at collabora.com> wrote:
> From: Timothy Arceri <t_arceri at yahoo.com.au>
>
> ---
>  docs/devinfo.html | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>
> diff --git a/docs/devinfo.html b/docs/devinfo.html
> index 8ebf80f..ed9eb9b 100644
> --- a/docs/devinfo.html
> +++ b/docs/devinfo.html
> @@ -162,6 +162,24 @@ components.
>  perhaps, in very trivial cases.)
>  </ul>
>
> +<h3>Git Tips</h3>
> +
> +<ul>
> +<li>Test for build breakage between patches e.g last 8 commits.
> +<pre>
> +    git rebase -i --exec="make -j4" HEAD~8
> +</pre>
> +<li>Sets the default mailing address for your repo.
> +<pre>
> +    git config --local sendemail.to mesa-dev at lists.freedesktop.org

This is what I have in ~/.gitconfig:

[sendemail]
...
    # don't cc addresses in commit messages
    suppresscc = all
...
[alias]
    # nice short log looking like the cgit web, type "git l"
    # (this should be one line - silly gmail wrapping)
    l = log --graph --pretty=format:'%Cred%h%Creset
-%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold cyan)<%an>%Creset'

    # e.g. type "git send-mesa -5" to send top 5 commits to mesa-dev
    send-mesa = send-email --to=mesa-dev at lists.freedesktop.org
    send-piglit = send-email --to=piglit at lists.freedesktop.org
    send-dri = send-email --to=dri-devel at lists.freedesktop.org
    send-llvm = send-email --to=llvm-commits at lists.llvm.org
[push]
    # push the current branch to its upstream branch, but refuse to
    # push if the upstream branch’s name is different from the local one
    default = simple
[rebase]
    # add --stat to rebase and pull --rebase
    stat = true
[branch]
    # git pull on new branches will always do rebase
    autosetuprebase = always
[branch "master"]
    # for master: always do pull --rebase, applies to existing branches as well
    rebase = true

Marek