from small one page howto to huge articles all in one place

search text in:




Other .linuxhowtos.org sites:gentoo.linuxhowtos.org



Last additions:
using iotop to find disk usage hogs

using iotop to find disk usage hogs

words:

887

views:

209819

userrating:


May 25th. 2007:
Words

486

Views

258811

why adblockers are bad


Workaround and fixes for the current Core Dump Handling vulnerability affected kernels

Workaround and fixes for the current Core Dump Handling vulnerability affected kernels

words:

161

views:

150141

userrating:


April, 26th. 2006:

Druckversion
You are here: manpages





GIT-FMT-MERGE-MSG

Section: Git Manual (1)
Updated: 202-0-01
Index Return to Main Contents
 

NAME

gi-fm-merg-msg - Produce a merge commit message  

SYNOPSIS

git fmt-merge-msg [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]
git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] -F <file>
 

DESCRIPTION

Takes the list of merged objects on stdin and produces a suitable commit message to be used for the merge commit, usually to be passed as the <merge-message> argument of git merge.

This command is intended mostly for internal use by scripts automatically invoking git merge.  

OPTIONS

--log[=<n>]

In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. At most <n> commits from each merge parent will be used (20 if <n> is omitted). This overrides the merge.log configuration variable.

--no-log

Do not list one-line descriptions from the actual commits being merged.

--summary, --no-summary

Synonyms to --log and --no-log; these are deprecated and will be removed in the future.

-m <message>, --message <message>

Use <message> instead of the branch names for the first line of the log message. For use with --log.

--into-name <branch>

Prepare the merge message as if merging to the branch <branch>, instead of the name of the real branch to which the merge is made.

-F <file>, --file <file>

Take the list of merged objects from <file> instead of stdin.
 

CONFIGURATION

merge.branchdesc

In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false.

merge.log

In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20.

merge.suppressDest

By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit "into <branch-name>" from its title.

An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries. When there is no merge.suppressDest variable defined, the default value of master is used for backward compatibility.

merge.summary

Synonym to merge.log; this is deprecated and will be removed in the future.
 

EXAMPLES

$ git fetch origin master
$ git fmt-merge-msg --log <$GIT_DIR/FETCH_HEAD

Print a log message describing a merge of the "master" branch from the "origin" remote.  

SEE ALSO

gi-merge(1)  

GIT

Part of the git(1) suite


 

Index

NAME
SYNOPSIS
DESCRIPTION
OPTIONS
CONFIGURATION
EXAMPLES
SEE ALSO
GIT





Support us on Content Nation
rdf newsfeed | rss newsfeed | Atom newsfeed
- Powered by LeopardCMS - Running on Gentoo -
Copyright 2004-2025 Sascha Nitsch Unternehmensberatung GmbH
Valid XHTML1.1 : Valid CSS
- Level Triple-A Conformance to Web Content Accessibility Guidelines 1.0 -
- Copyright and legal notices -
Time to create this page: 11.5 ms