Hi,
On Sun, 22 Jul 2007, Paolo Ciarrocchi wrote:
> On 7/22/07, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
>
> > On Sun, 22 Jul 2007, Paolo Ciarrocchi wrote:
> >
> > > Initial Italian translation
> >
> > Thank you very much! I took the liberty of squashing your 3 commits
> > into one ;-)
>
> Yeah, I was writing you an email suggesting to at least merge my latest
> patch into the previous one.
;-)
> Out of curiosity, how did you merge my 3 commits into one? (I'm really a
> newbie).
There are two nice way to do it: Either make a new branch and squash
merge the commits:
$ git reset --hard HEAD~3
$ git merge --squash HEAD@{1}
(Explanation: This does not really make a new branch, but resets the
current HEAD 3 commits back. Then it uses the _reflog_ to get at the old
HEAD, and merges it with the "--squash" option.)
The second is what I actually did: I used the interactive mode of rebase:
$ git rebase -i HEAD~3
[edit the 2nd and 3rd "pick" to become "squash"]
> > I see that 5 translations are missing:
> >
> > Commit, Checkout..., Unstage From Commit, Sign Off, Apple
> >
> > I guess that "Unstage From Commit" needs to be translated, but that
> > you wanted to keep the others as-English, right?
>
> Yes, I even translated a few words that I think should remain in
> English. I FWed my patch to my local LUG, I'll collect some feedback and
> post a followup patch.
Wonderful!
Ciao,
Dscho
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
