22 lines · 637 B · Text
RawDownload
#!/bin/sh if [ "$1" != "merge" -a "$1" != "noop" ]; then    printf "Usage: $0 <merge|noop [REF_HASH]>\n"    exit 0fi [ "$1" = "noop" ] && merge_opts="-s ours" nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1)if [ -z "$nextrev" ]; then    printf "Nothing to merge..\n"    exit 0fiprintf "Merging $(git log -n 1 --oneline $nextrev)\n"git merge --no-commit $merge_opts --no-ff --log $nextrev if [ "$1" = "noop" -a -n "$2" ]; then    printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSGfi printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t