Re: [PATCH] which-page

[David Kastrup]

Thomas Morley <address@hidden> writes:

> 2012/6/28 David Kastrup <address@hidden>:
> (...)
>
> Hi David,
>
> thanks for your help.
> Now the next question:
> I tried to make a new patch set, I've got:
>
> From e63620616e15f03a32e9a80ce4afe8ef5017013c Mon Sep 17 00:00:00 2001
> From: Harm <address@hidden>
> Date: Thu, 28 Jun 2012 23:18:41 +0200
> Subject: [PATCH 2/2] which-page
>
> renaming and changing "0" into "-1"
> ---
>  ly/titling-init.ly |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/ly/titling-init.ly b/ly/titling-init.ly
> index 9f3c644..7b00446 100644
> --- a/ly/titling-init.ly
> +++ b/ly/titling-init.ly
> @@ -101,8 +101,8 @@ book last one."
>        (interpret-markup layout props arg)
>        empty-stencil))
>
> -#(define ((which-page nmbr) layout props arg)
> - (if (= (chain-assoc-get 'page:page-number props 0) nmbr)
> +#(define ((on-page nmbr) layout props arg)
> + (if (= (chain-assoc-get 'page:page-number props -1) nmbr)
>     (interpret-markup layout props arg)
>     empty-stencil))

That's a patch 2/2.  In this case, you don't really want to have two
separate commits, but replace the previous commit with a changed one.
The usual way to do that is to commit with git commit --amend ...

Now that you already have made two commits, the idea is to fold both
commits into one.  Assuming that you have set EDITOR/VISUAL to an editor
with which you are reasonably comfortable, you can do that with

git rebase -i HEAD~2

and then editing the offered file by marking the second commit with
"fixup".  After that, reupload with git cl.

-- 
David Kastrup