repo.or.cz
/
socialgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix script loosing the actual merge line after the recent changes moved things around
2007-12-07
Calv
i
n Sp
e
alman
Fix script loosing
t
he actual merge line
a
f
t
er the
.
.
.
commit
|
commitdiff
|
tree
2007-12-05
Calvin Spealman
Push tags c
r
eated by new
br
a
nches
s
o everyone gets
.
.
.
commit
|
commitdiff
|
tree
2007-12-05
Calvin Spealman
I
m
plement par
e
n
t branching
.
Track who a branch comes
.
.
.
commit
|
commitdiff
|
tree
2007-12-04
Calv
i
n
S
pealman
Make
s
ure rebasing works when
t
here are
n
ew local and
.
.
.
commit
|
commitdiff
|
tree
2007-12-04
Cal
v
in
S
pe
a
lman
Ca
n
do a dry
r
un an
d
i
s
v
erbose about what is me
r
g
e
d
commit
|
commitdiff
|
tree
2007-11-30
Calvin
S
pealman
Ha
n
dle a
b
ort case for commit
bette
r
and lea
v
e
in ma
s
ter
.
.
.
commit
|
commitdiff
|
tree
2007-11-29
C
alvin Spea
l
man
D
ont rebase if yo
u
dont
commit!
commit
|
commitdiff
|
tree
2007-11-29
Calvin Spealman
M
e
rge in
dirty ch
a
nges
more
s
a
fely
commit
|
commitdiff
|
tree
2007-11-29
Calv
i
n Spealm
a
n
Hook fixes and much
faster commitb
r
anch
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealman
Call
h
ook for
p
os
t
-change-branch
commit
|
commitdiff
|
tree
2007-11-20
Calvin S
p
ealm
a
n
Determine co
m
pletion
m
o
r
e properly
commit
|
commitdiff
|
tree
2007-11-20
Calvin
S
pealm
a
n
T
r
y
to only bail rebase if
there is no dif
f
commit
|
commitdiff
|
tree
2007-11-20
C
al
v
in Spealman
Handle reb
a
se case
s
m
ore
pro
p
erly
commit
|
commitdiff
|
tree
2007-11-20
Calvin
Spealman
D
o
nt t
r
y to add a target
b
r
anch to commit
.
only commitbranch
.
.
.
commit
|
commitdiff
|
tree
2007-11-20
Calvi
n
Speal
m
a
n
Make sur
e
rebase on updat
e
is alwa
y
s
triggered
.
commit
|
commitdiff
|
tree
2007-11-20
C
alvin Spealman
Made rebasing local
t
hi
n
gs on remote
c
h
anges before
.
.
.
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealman
actuall
y
do wha
t
the last
c
ommit p
r
o
m
ised
commit
|
commitdiff
|
tree
2007-11-20
C
alvin Spealman
merg
e
fr
o
m
master is
l
es
s
loud
commit
|
commitdiff
|
tree
2007-11-20
Cal
v
in Spealman
mor
e
f
i
xes and b
e
tte
r
pa
t
h gen
e
ra
t
ion for hooks
commit
|
commitdiff
|
tree
2007-11-19
Calvi
n
Spealman
Many fixe
s
including bet
t
er merg
e
to master and smarter
.
.
.
commit
|
commitdiff
|
tree
2007-11-19
C
a
l
vin Speal
m
an
Dont
c
ha
n
g
e
if already in a b
r
anch
commit
|
commitdiff
|
tree
2007-11-19
Cal
v
in
S
pealman
stashing dirty working
c
o
py
commit
|
commitdiff
|
tree
2007-11-17
Ca
l
vin Spealman
eof
commit
|
commitdiff
|
tree
2007-11-17
Cal
v
in Sp
e
alman
make mergebr
a
nch executab
l
e
commit
|
commitdiff
|
tree
2007-11-15
Calvin Spealman
Even
m
ore d
e
scriptive
commit
|
commitdiff
|
tree
2007-11-15
Cal
v
in Spealman
More descriptive mer
g
ing co
m
ment
s
commit
|
commitdiff
|
tree
2007-11-15
Cal
v
in Sp
e
alman
Only do reb
a
se dirty bra
n
ch when n
e
eded
commit
|
commitdiff
|
tree
2007-11-14
Calvin Spea
l
m
an
F
e
tch
m
ore f
o
r
updates
commit
|
commitdiff
|
tree
2007-11-14
Calvi
n
Spealman
Stash befo
r
e rebase
commit
|
commitdiff
|
tree
2007-11-13
C
a
lvin Speal
m
an
A
ctual
l
y
c
o
mpare the right
t
hings for
the ch
a
nged file
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Ca
l
vin S
p
ealman
bugfix
.
e
o
f
commit
|
commitdiff
|
tree
2007-11-13
C
alvin S
p
ealman
M
ore
e
x
p
ressive updating
commit
|
commitdiff
|
tree
2007-11-13
Cal
v
in
S
p
e
a
l
man
Th
i
s is better
commit
|
commitdiff
|
tree
2007-11-13
Calv
i
n
Spealman
Not sure i
f
t
h
is
help
s
commit
|
commitdiff
|
tree
2007-11-13
C
a
l
v
in Spealman
Make m
e
rgefrommaster execu
t
abl
e
an
d
update
m
er
g
ebran
c
h
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Ca
l
vin Spealman
Add he
l
per to m
e
r
g
e ma
s
ter into the curre
n
t branch
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Cal
v
in Spea
l
ma
n
F
i
x message
commit
|
commitdiff
|
tree
2007-11-12
Calv
i
n S
p
ea
l
man
I
gnore some stuff
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Ma
k
e sure we d
o
nt create a
n
existing br
a
nch
commit
|
commitdiff
|
tree
2007-11-12
Calvi
n
Spea
l
man
Some qui
c
ker exiting on problems in rebasebranc
h
commit
|
commitdiff
|
tree
2007-11-12
Calvin Sp
e
alman
Mov
e
d into bin
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spea
l
man
pus
h
and pul
l
tags
m
ore t
o
m
ake sure they sta
y
in
s
yn
c
commit
|
commitdiff
|
tree
2007-11-12
Calvin S
p
ealman
F
i
xu
p
merge scr
i
p
t
commit
|
commitdiff
|
tree
2007-11-12
Calvin
S
pealman
Dont force the push
commit
|
commitdiff
|
tree
2007-11-12
C
a
lvin
Spe
a
lman
Merge in master changes before commit
i
ng
.
commit
|
commitdiff
|
tree
2007-11-12
Ca
l
vin S
p
ealman
Rename
e
ndbranch to mergebran
c
h a
n
d dont del
e
te after
.
.
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Rem
o
ve inst
a
llation of up
d
ated sc
r
ipt
s
.
commit
|
commitdiff
|
tree
2007-11-12
Ca
l
vin Spe
a
l
m
an
Defa
u
lt rebase-target to
mas
t
er
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealm
a
n
Only end a
b
ranch if its rebase i
s
compl
e
te
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
U
pdate before commi
t
ting and only commit if all updates
.
.
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Overwrite remot
e
branch even if
its not an ancestor
.
.
.
commit
|
commitdiff
|
tree
2007-11-09
Ca
l
vin Spealman
Separa
t
ed rebas
i
ng helpe
r
a
nd branch terminating
.
Update
.
.
.
commit
|
commitdiff
|
tree
2007-11-09
Cal
v
in
S
pealm
a
n
Replace
path
s
wi
t
h
o
rigin
a
n
d
m
ake sure to fetch updat
e
d
.
.
.
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealman
C
l
ean messages
commit
|
commitdiff
|
tree
2007-11-08
Calvin
Spealman
origi
n
, not direct uri
commit
|
commitdiff
|
tree
2007-11-08
Cal
v
in Spealman
Add more scri
p
t
s
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealm
a
n
endbranc
h
is a lot lot lot smar
t
er now
.
Rerun it t
o
.
.
.
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealma
n
Initial checkin of the scripts p
u
lled from
t
he social
s
erve
.
.
.
commit
|
commitdiff
|
tree