Skip to main content

Browse the archive

Revision bc88eb8cce00985cfbb5533e6b75e15cdecd9be5 authored by Tigran Mkrtchyan on 26 October 2017, 15:25:12 UTC, committed by Tigran Mkrtchyan on 26 October 2017, 19:22:36 UTC 
add tag.gpgSign config option to force all tags be GPG-signed
 
Motivation:
in some workflows we have no control on how git command is executed,
however a signed tags are required.

The new config-file option tag.gpgSign enforces signed tags. Additional
command line option --no-gpg-sign is added to disable such behavior if
needed.

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
1 parent 4e40fb3
Raw File
xxdiff 
diff_cmd () {
	"$merge_tool_path" \
		-R 'Accel.Search: "Ctrl+F"' \
		-R 'Accel.SearchForward: "Ctrl+G"' \
		"$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -X --show-merged-pane \
			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
			-R 'Accel.Search: "Ctrl+F"' \
			-R 'Accel.SearchForward: "Ctrl+G"' \
			--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" -X $extra \
			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
			-R 'Accel.Search: "Ctrl+F"' \
			-R 'Accel.SearchForward: "Ctrl+G"' \
			--merged-file "$MERGED" "$LOCAL" "$REMOTE"
	fi
}
back to top