milki

--- src/wmgtemp-1.1/src/Makefile.orig	2020-06-27 23:40:37.181571261 -0700
+++ src/wmgtemp-1.1/src/Makefile	2020-06-27 23:40:46.081571294 -0700
@@ -3,7 +3,7 @@
 LIB     = lib
 LDFLAGS = -L/usr/X11R6/$(LIB) -lXpm -lXext -lX11 -lsensors
 BINARY  = wmgtemp
-CCFLAGS = -Wall -g
+CCFLAGS = -Wall -g -fcommon
 INSTDIR = /usr/local/bin
 

milki

milki@dashi:/tmp/docu$ touch a; git add a; git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	new file:   a

milki@dashi:/tmp/docu$ git reset HEAD --hard; git status
HEAD is now at 49c9f9d init
On branch master

milki

#!/bin/bash

# gitolite mirror push <slave> <repo>

CMD=$1
SLAVE=$2
REPO=$3

script="$(gitolite query-rc GL_BINDIR)"/commands/mirror

milki

repo devs/..*
   - VREF/blah

repo devs/CREATOR/..*
   C = @users
   RW = @users


(user dev) git clone git@git:devs/dev/blah

milki

22:39 < milki> all i need is dwarffortress
22:39 < milki> \o/
22:39 < milki> and irc, aka multiplayer notepad
22:40 -!- mode/#git [+o Eugene] by ChanServ
22:40 -!- Eugene changed the topic of #git to: Current stable version: 1.8.2.1 | Start here: http://jk.gs/git/ | Getting "Cannot send to channel" or unable to change nick? /msg gitinfo .voice | git is really just a massive game of multiplayer notepad
22:40 -!- mode/#git [-o Eugene] by Eugene
22:40 < Nevik> lol
22:41 < milki> hehehe
22:41 < Nevik> you had to say it, didnt you
22:41 < HedgeMage> heh

milki

#!/bin/sh

# xargs -tpa /home/milki/tmp/redo-merges/merges -L 3 /home/milki/tmp/redo-merges/remerge

# plan

# HEAD points to either the last redone merge or not a merge
    # if last redone merge, NEW merge base is base of last merge
        # git rev-parse HEAD^2 last "branch"
    # else head is NEW merge base