summary refs log tree commit diff stats
path: root/ABOUT_THIS_BRANCH
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-02-04 22:06:31 +0100
committerhut <hut@lavabit.com>2010-03-09 14:40:08 +0100
commitcf81a11ada43078a68960f9118c5879f1acf8f61 (patch)
treef19711f8eb7479a2db70c503a55b86b22cffba88 /ABOUT_THIS_BRANCH
parent1a1ca6dea05867d832517346ea8e49f8cd1e41f0 (diff)
downloadranger-cf81a11ada43078a68960f9118c5879f1acf8f61.tar.gz
custom: added info about this branch
Diffstat (limited to 'ABOUT_THIS_BRANCH')
-rw-r--r--ABOUT_THIS_BRANCH14
1 files changed, 14 insertions, 0 deletions
diff --git a/ABOUT_THIS_BRANCH b/ABOUT_THIS_BRANCH
new file mode 100644
index 00000000..ae09d54d
--- /dev/null
+++ b/ABOUT_THIS_BRANCH
@@ -0,0 +1,14 @@
+I put my personal branch online, maybe you find some of the
+parts useful. To see whats different, type:
+
+git diff master..hut
+
+This branch is being regularily rebased on the master branch,
+which rewrites history, so maybe its better to pick single commits
+from this branch into your own branch rather than working directly
+on this one:
+
+git log master..hut
+# search for a commit you like, write down SHA1 identifier
+git checkout <your branch>
+git cherry-pick <SHA1 of the commit>
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 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237