Skip to content

Commit

Permalink
--add: Make sed command compatible with BSD sed
Browse files Browse the repository at this point in the history
Tested on sed from Mac OS X Mountain Lion, and with gsed from Homebrew.
  • Loading branch information
matthewlmcclure committed Dec 13, 2013
1 parent 0ee38fb commit 81f5f6f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ integration_edit () {
if test -n "$append_branches"
then
echo "$append_branches" |
sed -e '/^$/d' -e 's/^/\nmerge /'
sed -e '/^$/d' -e 's/^/\
merge /'
fi
echo &&
git stripspace --comment-lines <<EOF
Expand Down

1 comment on commit 81f5f6f

@johnkeeping
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you sign-off the commit? (See https://github.com/git/git/blob/master/Documentation/SubmittingPatches#L225 for what this means.)

The patch itself looks sensible.

Please sign in to comment.