summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-02-04 02:51:17 +0100
committerhut <hut@lavabit.com>2010-02-04 02:51:22 +0100
commit3eca1d01dae7efce97eb69af6e3d1f78ab31d1df (patch)
treecb73659ea0e3faa32f4f2c9ccd52425517c9cb85
parent8111b8e97219ef289b25a296a2775c8975b01dc9 (diff)
downloadranger-3eca1d01dae7efce97eb69af6e3d1f78ab31d1df.tar.gz
pick.sh: added variables for easier customization
-rwxr-xr-xdoc/pick.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/pick.sh b/doc/pick.sh
index fb9da83b..baa41c46 100755
--- a/doc/pick.sh
+++ b/doc/pick.sh
@@ -8,17 +8,18 @@
 # Bad commits are marked with a "custom:" at the beginning
 # of the commit message.
 
-BRANCH=`git branch 2>/dev/null|grep -e ^* | tr -d \*\ `
+MASTER_BRANCH='master'
+CUSTOM_BRANCH='hut'
+ORIGINAL_BRANCH=`git branch 2>/dev/null|grep -e ^* | tr -d \*\ `
 
-git checkout master
+git checkout $MASTER_BRANCH
 
 while read -r hash tag rest; do
 	if [ $tag != 'custom:' ]; then
 		git cherry-pick $hash || exit 1
 	fi
-done < <(git log --oneline --no-color master..hut)
+done < <(git log --oneline --no-color $MASTER_BRANCH..$CUSTOM_BRANCH)
 
-git checkout hut
-git rebase master
-
-git checkout $BRANCH
+git checkout $CUSTOM_BRANCH
+git rebase $MASTER_BRANCH
+git checkout $ORIGINAL_BRANCH
r@cmpwn.com> 2018-02-01 18:42:03 -0500 Reduce boilerplate in worker/UI' href='/akspecs/aerc/commit/worker/worker.go?id=d24e4712a45e03d79fa1ccb71d00c5b830d5a305'>d24e471 ^
a0be5e8 ^

b5d5e0d ^

9ef2a57 ^
2dc4365 ^





1265d9c ^

b5d5e0d ^
d24e471 ^
1b8b6e2 ^

d24e471 ^

b5d5e0d ^
d24e471 ^
6394e38 ^
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