* [PATCH] Typo in RelNotes.
@ 2008-06-12 2:38 Mikael Magnusson
2008-06-12 3:59 ` Tarmigan
0 siblings, 1 reply; 5+ messages in thread
From: Mikael Magnusson @ 2008-06-12 2:38 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Signed-off-by: Mikael Magnusson <mikachu@gmail.com>
---
This is the first patch I send for git so I hope i didn't do anything silly :).
Documentation/RelNotes-1.5.6.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/RelNotes-1.5.6.txt b/Documentation/RelNotes-1.5.6.txt
index a79e4b9..ac4881e 100644
--- a/Documentation/RelNotes-1.5.6.txt
+++ b/Documentation/RelNotes-1.5.6.txt
@@ -70,7 +70,7 @@ Updates since v1.5.5
* "git init --bare" is a synonym for "git --bare init" now.
-* "git gc --auto" honors a new pre-aut-gc hook to temporarily disable it.
+* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.
* "git log --pretty=tformat:<custom format>" gives a LF after each entry,
instead of giving a LF between each pair of entries which is how
--
1.5.5.GIT
--
Mikael Magnusson
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Typo in RelNotes.
2008-06-12 2:38 [PATCH] Typo in RelNotes Mikael Magnusson
@ 2008-06-12 3:59 ` Tarmigan
2008-06-12 4:53 ` Jeff King
0 siblings, 1 reply; 5+ messages in thread
From: Tarmigan @ 2008-06-12 3:59 UTC (permalink / raw)
To: Mikael Magnusson; +Cc: Junio C Hamano, git
On Wed, Jun 11, 2008 at 7:38 PM, Mikael Magnusson <mikachu@gmail.com> wrote:
> * "git init --bare" is a synonym for "git --bare init" now.
>
> -* "git gc --auto" honors a new pre-aut-gc hook to temporarily disable it.
> +* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.
>
> * "git log --pretty=tformat:<custom format>" gives a LF after each entry,
> instead of giving a LF between each pair of entries which is how
Any interest in fixing the typo on the next line while you're at it?
-Tarmigan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Typo in RelNotes.
2008-06-12 3:59 ` Tarmigan
@ 2008-06-12 4:53 ` Jeff King
2008-06-12 5:06 ` Tarmigan
0 siblings, 1 reply; 5+ messages in thread
From: Jeff King @ 2008-06-12 4:53 UTC (permalink / raw)
To: Tarmigan; +Cc: Mikael Magnusson, Junio C Hamano, git
On Wed, Jun 11, 2008 at 08:59:37PM -0700, Tarmigan wrote:
> On Wed, Jun 11, 2008 at 7:38 PM, Mikael Magnusson <mikachu@gmail.com> wrote:
> > * "git init --bare" is a synonym for "git --bare init" now.
> >
> > -* "git gc --auto" honors a new pre-aut-gc hook to temporarily disable it.
> > +* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.
> >
> > * "git log --pretty=tformat:<custom format>" gives a LF after each entry,
> > instead of giving a LF between each pair of entries which is how
>
> Any interest in fixing the typo on the next line while you're at it?
Maybe I am blind, but I don't see a typo. Are you referring to tformat,
which looks like a typo, but is actually correct?
-Peff
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Typo in RelNotes.
2008-06-12 4:53 ` Jeff King
@ 2008-06-12 5:06 ` Tarmigan
2008-06-12 6:14 ` Jeff King
0 siblings, 1 reply; 5+ messages in thread
From: Tarmigan @ 2008-06-12 5:06 UTC (permalink / raw)
To: Jeff King; +Cc: Mikael Magnusson, Junio C Hamano, git
On Wed, Jun 11, 2008 at 9:53 PM, Jeff King <peff@peff.net> wrote:
> On Wed, Jun 11, 2008 at 08:59:37PM -0700, Tarmigan wrote:
>
>> On Wed, Jun 11, 2008 at 7:38 PM, Mikael Magnusson <mikachu@gmail.com> wrote:
>> > * "git init --bare" is a synonym for "git --bare init" now.
>> >
>> > -* "git gc --auto" honors a new pre-aut-gc hook to temporarily disable it.
>> > +* "git gc --auto" honors a new pre-auto-gc hook to temporarily disable it.
>> >
>> > * "git log --pretty=tformat:<custom format>" gives a LF after each entry,
>> > instead of giving a LF between each pair of entries which is how
>>
>> Any interest in fixing the typo on the next line while you're at it?
>
> Maybe I am blind, but I don't see a typo. Are you referring to tformat,
> which looks like a typo, but is actually correct?
Oops you're right. That's what I was thinking of. Junio's commit
message explains it well. Should something be added to the man page
about it?
-Tarmigan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Typo in RelNotes.
2008-06-12 5:06 ` Tarmigan
@ 2008-06-12 6:14 ` Jeff King
0 siblings, 0 replies; 5+ messages in thread
From: Jeff King @ 2008-06-12 6:14 UTC (permalink / raw)
To: Tarmigan; +Cc: Junio C Hamano, git
On Wed, Jun 11, 2008 at 10:06:13PM -0700, Tarmigan wrote:
> > Maybe I am blind, but I don't see a typo. Are you referring to tformat,
> > which looks like a typo, but is actually correct?
>
> Oops you're right. That's what I was thinking of. Junio's commit
> message explains it well. Should something be added to the man page
> about it?
How about this? I worry that the perl in the example is unnecessarily
complex, but I couldn't think of a simpler way to show "in this one, the
trailing newline is missing". So I am open to suggestions.
-- >8 --
document --pretty=tformat: option
This was introduced in 4da45bef, but never documented
anywhere.
---
Documentation/pretty-formats.txt | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index e8bea3e..14a2665 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -124,3 +124,24 @@ The placeholders are:
- '%m': left, right or boundary mark
- '%n': newline
- '%x00': print a byte from a hex code
+
+* 'tformat:'
++
+The 'tformat:' format works exactly like 'format:', except that it
+provides "terminator" semantics instead of "separator" semantics. In
+other words, each commit has the message separator (usually a newline)
+appended, rather than placed between entries. This means that the final
+entry of a single-line format will be properly terminated with a new
+line, just as the "oneline" format does. For example:
++
+---------------------
+$ git log -2 --pretty=format:%h 4da45bef \
+ | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
+4da45be
+7134973 -- NO NEWLINE
+
+$ git log -2 --pretty=tformat:%h 4da45bef \
+ | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
+4da45be
+7134973
+---------------------
--
1.5.6.rc2.168.g23af0b.dirty
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-06-12 6:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-12 2:38 [PATCH] Typo in RelNotes Mikael Magnusson
2008-06-12 3:59 ` Tarmigan
2008-06-12 4:53 ` Jeff King
2008-06-12 5:06 ` Tarmigan
2008-06-12 6:14 ` Jeff King
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).