summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-04-06 03:23:46 +0200
committerJunio C Hamano <gitster@pobox.com>2008-04-12 19:28:18 -0700
commitefb779f8873e5aa36be29a4e551186c62c1b580c (patch)
treefee6f6a34142af04294bbb2ce13822bf4ccb1c13 /git-merge.sh
parent6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 (diff)
downloadgit-efb779f8873e5aa36be29a4e551186c62c1b580c.tar.gz
merge, pull: add '--(no-)log' command line option
These are the command line option equivalents of the 'merge.log' config variable. The patch also updates documentation and bash completion accordingly, and adds a test. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 793c015550..69b35d87e6 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -12,6 +12,8 @@ stat show a diffstat at the end of the merge
n,no-stat don't show a diffstat at the end of the merge
summary (synonym to --stat)
no-summary (synonym to --no-stat)
+log add list of one-line log to merge commit message
+no-log don't add list of one-line log to merge commit message
squash create a single commit instead of doing a merge
commit perform a commit if the merge sucesses (default)
ff allow fast forward (default)
@@ -39,7 +41,7 @@ use_strategies=
allow_fast_forward=t
allow_trivial_merge=t
-squash= no_commit=
+squash= no_commit= log_arg=
dropsave() {
rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
@@ -154,6 +156,8 @@ parse_config () {
show_diffstat=false ;;
--stat|--summary)
show_diffstat=t ;;
+ --log|--no-log)
+ log_arg=$1 ;;
--squash)
test "$allow_fast_forward" = t ||
die "You cannot combine --squash with --no-ff."
@@ -261,7 +265,7 @@ else
merge_name=$(for remote
do
merge_name "$remote"
- done | git fmt-merge-msg
+ done | git fmt-merge-msg $log_arg
)
merge_msg="${merge_msg:+$merge_msg$LF$LF}$merge_name"
fi