Jonathan Nieder 2102440c17 fmt-merge-msg -m to override merge title ...

Since v1.7.1.1~23^2 (merge: --log appends shortlog to message if
specified, 2010-05-11), the fmt-merge-msg backend supports custom text
to override the merge title "Merge <foo> into <bar>".

Expose this functionality for scripted callers.  Example:

 git fmt-merge-msg --log -m \
	"$(printf '%s\n' \
	    "Merge branch 'api-cleanup' into feature" \
	    '' \
	    'This is to use a few functions refactored for this purpose.'
	)" <.git/FETCH_HEAD

Cc: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2010-08-18 14:02:04 -07:00

..

add.c

git add: Add the "--ignore-missing" option for the dry run

2010-07-12 15:13:54 -07:00

annotate.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

apply.c

Merge branch 'jp/string-list-api-cleanup'

2010-06-30 11:55:38 -07:00

archive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

bisect--helper.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

blame.c

Merge branch 'cp/textconv-cat-file'

2010-06-27 12:07:55 -07:00

branch.c

Merge branch 'sm/branch-broken-ref'

2010-06-21 06:02:47 -07:00

bundle.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

cat-file.c

Merge branch 'cp/textconv-cat-file'

2010-06-27 12:07:55 -07:00

check-attr.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

check-ref-format.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

checkout-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

checkout.c

Merge branch 'gv/portable'

2010-06-21 06:02:44 -07:00

clean.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

clone.c

Merge branch 'ph/clone-message-reword'

2010-06-18 11:16:53 -07:00

commit-tree.c

make commit_tree a library function

2010-04-01 23:53:54 -07:00

commit.c

Merge branch 'jk/maint-status-keep-index-timestamp'

2010-07-15 12:06:55 -07:00

config.c

Allow passing of configuration parameters in the command line

2010-03-28 09:48:25 -07:00

count-objects.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

describe.c

Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint

2010-06-16 16:21:15 -07:00

diff-files.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

diff-tree.c

Merge branch 'pb/log-first-parent-p-m'

2010-03-24 16:25:39 -07:00

diff.c

Merge branch 'jc/diff-merge-base-multi'

2010-07-16 15:45:35 -07:00

fast-export.c

string_list: Fix argument order for string_list_append

2010-06-27 10:06:52 -07:00

fetch-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

fetch.c

Merge branch 'jp/string-list-api-cleanup'

2010-06-30 11:55:38 -07:00

fmt-merge-msg.c

fmt-merge-msg -m to override merge title

2010-08-18 14:02:04 -07:00

for-each-ref.c

Merge branch 'maint'

2010-06-07 22:15:31 -07:00

fsck.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

gc.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

grep.c

Merge branch 'jn/grep-open'

2010-07-15 12:07:18 -07:00

hash-object.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

help.c

enums: omit trailing comma for portability

2010-05-31 16:59:27 -07:00

index-pack.c

Merge branch 'np/index-pack-memsave' into maint

2010-06-16 16:22:23 -07:00

init-db.c

handle "git --bare init <dir>" properly

2010-05-10 11:25:37 -07:00

log.c

Merge branch 'ar/decorate-color'

2010-06-30 11:55:40 -07:00

ls-files.c

Merge branch 'jp/string-list-api-cleanup'

2010-06-30 11:55:38 -07:00

ls-remote.c

ls-remote: print URL when no repo is specified

2010-05-11 22:55:44 -07:00

ls-tree.c

ls: remove redundant logic

2010-03-21 16:23:44 -07:00

mailinfo.c

enums: omit trailing comma for portability

2010-05-31 16:59:27 -07:00

mailsplit.c

string_list: Fix argument order for string_list_insert

2010-06-27 10:06:51 -07:00

merge-base.c

merge-base --independent to print reduced parent list in a merge

2010-08-18 14:02:03 -07:00

merge-file.c

Merge branch 'rs/diff-no-minimal' into maint

2010-06-21 05:38:50 -07:00

merge-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-ours.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-recursive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

merge-tree.c

merge-tree: fix where two branches share no changes

2010-07-14 12:56:49 -07:00

merge.c

merge: do not mistake (ancestor of) tag for branch

2010-08-18 14:02:02 -07:00

mktag.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

mktree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

mv.c

string_list: Fix argument order for string_list_insert

2010-06-27 10:06:51 -07:00

name-rev.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

notes.c

Merge branch 'maint'

2010-06-28 17:42:26 -07:00

pack-objects.c

Merge branch 'np/malloc-threading' into maint

2010-06-16 16:21:06 -07:00

pack-redundant.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

pack-refs.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

patch-id.c

patch-id: Add support for mbox format

2010-04-19 13:01:49 -07:00

prune-packed.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

prune.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

push.c

Merge branch 'maint'

2010-04-09 22:43:18 -07:00

read-tree.c

Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix

2010-07-08 18:55:50 -07:00

receive-pack.c

Merge branch 'tr/receive-pack-aliased-update-fix' into maint

2010-07-07 10:25:15 -07:00

reflog.c

Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'

2010-05-21 04:02:18 -07:00

remote.c

Merge branch 'jp/string-list-api-cleanup'

2010-06-30 11:55:38 -07:00

replace.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

rerere.c

Merge branch 'js/merge-rr-fix'

2010-07-15 12:08:36 -07:00

reset.c

Sync with 1.7.0.4

2010-03-31 15:14:27 -07:00

rev-list.c

rev-list: introduce --count option

2010-06-12 09:39:06 -07:00

rev-parse.c

Merge branch 'maint'

2010-07-07 11:18:26 -07:00

revert.c

revert: do not rebuild argv on heap

2010-06-29 10:36:13 -07:00

rm.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

send-pack.c

Merge branch 'ld/push-porcelain'

2010-03-15 00:58:24 -07:00

shortlog.c

string_list: Fix argument order for string_list_append

2010-06-27 10:06:52 -07:00

show-branch.c

show-branch: use DEFAULT_ABBREV instead of 7

2010-05-25 09:48:49 -07:00

show-ref.c

string_list: Fix argument order for string_list_insert

2010-06-27 10:06:51 -07:00

stripspace.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

symbolic-ref.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

tag.c

tag -v: use RUN_GIT_CMD to run verify-tag

2010-04-17 12:40:19 -07:00

tar-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

unpack-file.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

unpack-objects.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-index.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-ref.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

update-server-info.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

upload-archive.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

var.c

Merge branch 'lt/deepen-builtin-source'

2010-03-10 15:25:18 -08:00

verify-pack.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

verify-tag.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00

write-tree.c

Move 'builtin-*' into a 'builtin/' subdirectory

2010-02-22 14:29:41 -08:00