* Git support question part XXIV
@ 2012-02-02 10:27 Lars Ingebrigtsen
2012-02-02 10:38 ` Andreas Schwab
0 siblings, 1 reply; 6+ messages in thread
From: Lars Ingebrigtsen @ 2012-02-02 10:27 UTC (permalink / raw)
To: ding
Everything seems to work fine when doing merges from No Gnus to Ma Gnus,
but the messages on the gitlog group looks odd:
http://permalink.gmane.org/gmane.emacs.gnus.cvs/11779
It seems like the ChangeLog "diff" gets longer and longer and longer the
more I merge. But the bogus lines start with " +" instead of "+", so
it's not really a diff, either. So I'm wondering what it's doing, and
whether I'm doing anything wrong.
--
(domestic pets only, the antidote for overdose, milk.)
http://lars.ingebrigtsen.no * Sent from my Rome
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Git support question part XXIV
2012-02-02 10:27 Git support question part XXIV Lars Ingebrigtsen
@ 2012-02-02 10:38 ` Andreas Schwab
2012-02-02 10:41 ` Lars Ingebrigtsen
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Schwab @ 2012-02-02 10:38 UTC (permalink / raw)
To: ding
Lars Ingebrigtsen <larsi@gnus.org> writes:
> It seems like the ChangeLog "diff" gets longer and longer and longer the
> more I merge. But the bogus lines start with " +" instead of "+", so
> it's not really a diff, either. So I'm wondering what it's doing, and
> whether I'm doing anything wrong.
See git-diff(1), section COMBINED DIFF FORMAT for the description of the
format.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Git support question part XXIV
2012-02-02 10:38 ` Andreas Schwab
@ 2012-02-02 10:41 ` Lars Ingebrigtsen
2012-02-02 10:55 ` Andreas Schwab
0 siblings, 1 reply; 6+ messages in thread
From: Lars Ingebrigtsen @ 2012-02-02 10:41 UTC (permalink / raw)
To: Andreas Schwab; +Cc: ding
Andreas Schwab <schwab@linux-m68k.org> writes:
> See git-diff(1), section COMBINED DIFF FORMAT for the description of the
> format.
I see. But will the ChangeLog combined diff continue to increase in
size forever?
--
(domestic pets only, the antidote for overdose, milk.)
http://lars.ingebrigtsen.no * Sent from my Rome
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Git support question part XXIV
2012-02-02 10:41 ` Lars Ingebrigtsen
@ 2012-02-02 10:55 ` Andreas Schwab
2012-02-02 12:40 ` Steinar Bang
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Schwab @ 2012-02-02 10:55 UTC (permalink / raw)
To: Lars Ingebrigtsen; +Cc: ding
Lars Ingebrigtsen <larsi@gnus.org> writes:
> I see. But will the ChangeLog combined diff continue to increase in
> size forever?
As long as they differ from each other at the same place, yes. It's
inherent in the changelog format, since they always conflict.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Git support question part XXIV
2012-02-02 10:55 ` Andreas Schwab
@ 2012-02-02 12:40 ` Steinar Bang
2012-02-02 12:43 ` Lars Ingebrigtsen
0 siblings, 1 reply; 6+ messages in thread
From: Steinar Bang @ 2012-02-02 12:40 UTC (permalink / raw)
To: ding
The question is then: is the combined diff format meaningful at all?
Wouldn't it have been more meaningful to diff against the previous
commit on master?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Git support question part XXIV
2012-02-02 12:40 ` Steinar Bang
@ 2012-02-02 12:43 ` Lars Ingebrigtsen
0 siblings, 0 replies; 6+ messages in thread
From: Lars Ingebrigtsen @ 2012-02-02 12:43 UTC (permalink / raw)
To: ding
Steinar Bang <sb@dod.no> writes:
> Wouldn't it have been more meaningful to diff against the previous
> commit on master?
I would think so? Perhaps that's something that can be tweaked in the
gitlog script?
--
(domestic pets only, the antidote for overdose, milk.)
http://lars.ingebrigtsen.no * Sent from my Rome
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-02 12:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-02 10:27 Git support question part XXIV Lars Ingebrigtsen
2012-02-02 10:38 ` Andreas Schwab
2012-02-02 10:41 ` Lars Ingebrigtsen
2012-02-02 10:55 ` Andreas Schwab
2012-02-02 12:40 ` Steinar Bang
2012-02-02 12:43 ` Lars Ingebrigtsen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).