-
Notifications
You must be signed in to change notification settings - Fork 28
Expand file tree
/
Copy pathnull-merge
More file actions
executable file
·54 lines (48 loc) · 976 Bytes
/
null-merge
File metadata and controls
executable file
·54 lines (48 loc) · 976 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
#! /bin/sh
new_branch=""
old_branch=""
while getopts n:o: opt; do
case $opt in
n ) new_branch="$OPTARG" ;;
o ) old_branch="$OPTARG" ;;
esac
done
shift `expr $OPTIND - 1`
usage() {
echo "Usage: $0 [-o old_branch] [-n new_branch]|[old_branch new_branch]" >&2
exit 1
}
get_current_branch() {
current_branch="`git branch | grep '^\*' | awk '{print $2}'`"
}
if [ -n "$new_branch" ]; then
if [ -n "$old_branch" ]; then
if [ -n "$1" ]; then
usage
fi
else
get_current_branch
old_branch="$current_branch"
fi
elif [ -n "$old_branch" ]; then
if [ -n "$1" ]; then
usage
else
get_current_branch
new_branch="$current_branch"
fi
elif [ -n "$1" ]; then
if [ -n "$2" ]; then
if [ -n "$3" ]; then
usage
fi
old_branch="$1"
new_branch="$2"
else
usage
fi
else
usage
fi
git checkout "$new_branch" &&
exec git merge --strategy=ours "$old_branch"