Skip to content

Commit

Permalink
Merge pull request #5449
Browse files Browse the repository at this point in the history
6e6a36c contrib: show pull # in prompt for github-merge script (Wladimir J. van der Laan)
  • Loading branch information
laanwj committed Dec 9, 2014
2 parents 09ac7f9 + 6e6a36c commit 0a1d03c
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions contrib/devtools/github-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ else
echo "Dropping you on a shell so you can try building/testing the merged source." >&2
echo "Run 'git diff HEAD~' to show the changes being merged." >&2
echo "Type 'exit' when done." >&2
if [[ -f /etc/debian_version ]]; then # Show pull number in prompt on Debian default prompt
export debian_chroot="$PULL"
fi
bash -i
read -p "Press 'm' to accept the merge. " -n 1 -r >&2
echo
Expand Down

0 comments on commit 0a1d03c

Please sign in to comment.