summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-02-05 06:08:36 +0100
committerhut <hut@lavabit.com>2010-02-05 06:08:41 +0100
commit95b7c7b6b4c2b12ffc03d1278722f463d019d02b (patch)
treeb9e924a5ec27a6e0b0153629475eff46fc1eab5a
parent03b4aefab11192a20d541963d12b61c09738d6d2 (diff)
downloadranger-95b7c7b6b4c2b12ffc03d1278722f463d019d02b.tar.gz
pick.sh: added -m to checkout commads
-rwxr-xr-xdoc/pick.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/pick.sh b/doc/pick.sh
index baa41c46..348ae6f3 100755
--- a/doc/pick.sh
+++ b/doc/pick.sh
@@ -12,7 +12,7 @@ MASTER_BRANCH='master'
 CUSTOM_BRANCH='hut'
 ORIGINAL_BRANCH=`git branch 2>/dev/null|grep -e ^* | tr -d \*\ `
 
-git checkout $MASTER_BRANCH
+git checkout -m $MASTER_BRANCH
 
 while read -r hash tag rest; do
 	if [ $tag != 'custom:' ]; then
@@ -20,6 +20,6 @@ while read -r hash tag rest; do
 	fi
 done < <(git log --oneline --no-color $MASTER_BRANCH..$CUSTOM_BRANCH)
 
-git checkout $CUSTOM_BRANCH
+git checkout -m $CUSTOM_BRANCH
 git rebase $MASTER_BRANCH
-git checkout $ORIGINAL_BRANCH
+git checkout -m $ORIGINAL_BRANCH
'>dbe12410 ^
90560d71 ^
0e4a335e ^
90560d71 ^
672e3e50 ^












c5ffb6e1 ^


9570363a ^
c5ffb6e1 ^

9570363a ^
c5ffb6e1 ^

672e3e50 ^


76755b28 ^

90560d71 ^
76755b28 ^
dcc060c7 ^
9542bb11 ^

76755b28 ^

9542bb11 ^

76755b28 ^



65361948 ^
e8b1d3ff ^
76755b28 ^
e8b1d3ff ^
672e3e50 ^

c5ffb6e1 ^

76755b28 ^
672e3e50 ^



c5ffb6e1 ^
672e3e50 ^


c5ffb6e1 ^


672e3e50 ^



76755b28 ^

90560d71 ^
76755b28 ^
dcc060c7 ^
9542bb11 ^

76755b28 ^

9542bb11 ^

76755b28 ^

9542bb11 ^

76755b28 ^



65361948 ^
90560d71 ^
76755b28 ^
672e3e50 ^

e8b1d3ff ^
76755b28 ^
e8b1d3ff ^
672e3e50 ^



90560d71 ^
9570363a ^
672e3e50 ^
9570363a ^
672e3e50 ^
9570363a ^
c5ffb6e1 ^
672e3e50 ^


90560d71 ^
9570363a ^
672e3e50 ^
9570363a ^
672e3e50 ^
9570363a ^
672e3e50 ^




76755b28 ^

90560d71 ^
76755b28 ^
dcc060c7 ^
9542bb11 ^

76755b28 ^

9542bb11 ^

76755b28 ^

9542bb11 ^

76755b28 ^



65361948 ^
90560d71 ^
76755b28 ^
672e3e50 ^

e8b1d3ff ^
76755b28 ^
e8b1d3ff ^
672e3e50 ^



9570363a ^

672e3e50 ^
9570363a ^
672e3e50 ^
9570363a ^
c5ffb6e1 ^
672e3e50 ^


9570363a ^

672e3e50 ^
9570363a ^
672e3e50 ^
9570363a ^
672e3e50 ^




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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191