threads / patch / 43734

patchRe: [PATCH] Add config example with respect to branch

Subject: Re: [PATCH] Add config example with respect to branch

## tl;dr

2 messages between Dec 7, 2006 and Dec 7, 2006. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Aneesh Kumar K.V· Dec 7, 2006, 06:36 UTC · lore

[PATCH] Add config example with respect to branch

From: Aneesh Kumar K.V <aneesh.kumar@gmail.com>

Update config.txt with example with respect to branch config variable. This give a better idea regarding how branch names are expected.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
---
 Documentation/config.txt |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Show changes to Documentation/config.txt +5 −0

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9090762..d3518d1 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -31,6 +31,11 @@ Example
 		external = "/usr/local/bin/gnu-diff -u"
 		renames = true
 
+	[branch "devel"]
+		remote = origin
+		merge = refs/heads/devel
+
+
 Variables
 ~~~~~~~~~

-- 
1.4.4.1.g278f-dirty

Junio C Hamano· Dec 7, 2006, 19:20 UTC · re: Aneesh Kumar K.V · lore

I've tolerated patches in attachments, but please do not do this:

    This is a multi-part message in MIME format.
    --------------010006030902030700040300
    Content-Type: text/plain; charset=ISO-8859-1; format=flowed
    Content-Transfer-Encoding: 7bit

    --------------010006030902030700040300
    Content-Type: text/plain;
     name="0001-Add-config-example-with-respect-to-branch.txt"
    Content-Transfer-Encoding: 7bit
    Content-Disposition: inline;
     filename="0001-Add-config-example-with-respect-to-branch.txt"

    From: Aneesh Kumar K.V <aneesh.kumar@gmail.com>

    Update config.txt with example with respect to branch
    config variable. This give a better idea regarding
    how branch names are expected.

    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>
    ---
     Documentation/config.txt |    5 +++++
     1 files changed, 5 insertions(+), 0 deletions(-)

Instead have the proposed commit log message (and From: line if you are forwarding somebody else's patch, or if your MUA does not record your own name correctly) in the first part (which is empty in your message).