RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-01-22 05:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

./all admin-merge-2: show proper merge preview in the DP repo

Browse Source
This commit is contained in:
Rudolf Polzer 2010-05-23 17:05:21 +02:00
parent ba9bdae30b
commit 5ca7282426
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all
View File

@ -665,7 +665,7 @@ case "$cmd" in
if [ -n "$note" ]; then
reportdo4 echo "$note"
reportecho4 "--> not merging, already had this one rejected before"
elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color HEAD.."$ref"; git diff --color --find-copies-harder --ignore-space-change HEAD..."$ref"; } | less -r'; then
elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color master.."$ref"; git diff --color --find-copies-harder --ignore-space-change master..."$ref"; } | less -r'; then
git checkout master
org=`git rev-parse HEAD`
if ! git merge "$ref" 2>&1 | tee "$t"; then