[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git, merging patches
From: |
Bruno Haible |
Subject: |
Re: git, merging patches |
Date: |
Wed, 20 Jul 2011 00:53:10 +0200 |
User-agent: |
KMail/1.13.6 (Linux/2.6.37.6-0.5-desktop; KDE/4.6.0; x86_64; ; ) |
Hi Paul,
> > it is more appropriate to merge patches together and remove reverted
> > patches from the history and the ChangeLog.
>
> Here's a combined patch that should do that. It reflects my most
> recent proposal of leaving the dependencies alone.
Thanks a lot for taking the extra minutes to do that.
> I have looked through the Stanford tutorial you mentioned and picked up some
> tips.
Many of these tutorials suggest to use branches extensively. Personally I
minimize the use of branches and work almost exclusively with "git stash",
"git commit --amend", and "git rebase -i".
I'm sure Ralf does the opposite and uses branches a lot.
Anyway, what matters is that proposed and committed patches are easy to
review and easy to understand.
> I took the liberty
> of using "diff -w" to generate it, as that makes the diff easier to read.
Very fine. I'll reply to it in another mail.
Bruno
--
In memoriam Paul Schneider
<http://en.wikipedia.org/wiki/Paul_Schneider_(pastor)>
- Re: threadlib and emacs, (continued)
- Re: threadlib and emacs, Bruno Haible, 2011/07/17
- Re: threadlib and emacs, Paul Eggert, 2011/07/17
- Re: threadlib and emacs, Paul Eggert, 2011/07/17
- Re: threadlib and emacs, Bruno Haible, 2011/07/18
- Re: threadlib and emacs, Paul Eggert, 2011/07/19
- Re: threadlib and emacs, Bruno Haible, 2011/07/19
- Re: threadlib and emacs, Paul Eggert, 2011/07/25
- git, merging patches, Bruno Haible, 2011/07/18
- Re: git, merging patches, Paul Eggert, 2011/07/19
- Re: git, merging patches, Paul Eggert, 2011/07/19
- Re: git, merging patches,
Bruno Haible <=
- Re: threadlib and emacs, Bruno Haible, 2011/07/18
- Re: trouble with aclocal, Bruno Haible, 2011/07/18
Re: [PATCH 03/10] pthread_sigmask: new module, Bruno Haible, 2011/07/07
Re: [PATCH 03/10] pthread_sigmask: new module, Bruno Haible, 2011/07/07
Re: [PATCH 03/10] pthread_sigmask: new module, Bruno Haible, 2011/07/07
Re: [PATCH 03/10] pthread_sigmask: new module, Bruno Haible, 2011/07/07
Re: [PATCH 03/10] pthread_sigmask: new module, Bruno Haible, 2011/07/07
Re: [PATCH 03/10] pthread_sigmask: new module, Bruno Haible, 2011/07/07
Re: [PATCH 03/10] pthread_sigmask: new module, Bruno Haible, 2011/07/08
Re: [PATCH 03/10] pthread_sigmask: new module, Bruno Haible, 2011/07/08