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
Implement parent branching. Track who a branch comes from and only allow merging...
2007-12-05
C
a
l
vin Spealm
a
n
Implement pare
n
t br
a
n
c
h
i
ng
.
T
rac
k
who a branch comes
.
.
.
commit
|
commitdiff
|
tree
2007-12-04
C
a
lvin Spealman
Make
sur
e
rebasing works w
h
en
ther
e
are ne
w
local and
.
.
.
commit
|
commitdiff
|
tree
2007-12-04
C
a
l
v
in Sp
e
alman
Can do a
d
ry
r
u
n
a
nd is ve
r
bose about wha
t
is merged
commit
|
commitdiff
|
tree
2007-11-30
Cal
v
in Spealman
Hand
l
e
abor
t
c
a
se for commit better
and leave
in maste
r
.
.
.
commit
|
commitdiff
|
tree
2007-11-29
Calvin
S
pealman
Dont rebase if
you don
t
commit!
commit
|
commitdiff
|
tree
2007-11-29
Calvin Spealman
M
erge in dirt
y
changes more safely
commit
|
commitdiff
|
tree
2007-11-29
Calvin
S
peal
m
a
n
Hook f
i
xes and much faster
c
ommitb
r
anc
h
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealman
Call h
o
ok
f
or
post-ch
a
nge-branc
h
commit
|
commitdiff
|
tree
2007-11-20
Cal
v
in
S
pealman
D
etermine
c
o
m
plet
i
on more
p
r
operly
commit
|
commitdiff
|
tree
2007-11-20
Calv
i
n
Spe
a
lman
Tr
y
to only b
a
i
l
rebase if there
is no di
f
f
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealm
a
n
Hand
l
e
rebase c
a
se
s
more p
r
oper
l
y
commit
|
commitdiff
|
tree
2007-11-20
Calvin
S
pealman
Dont tr
y
to add
a
t
a
rget
branch
to commit
.
only commitbranch
.
.
.
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealman
Make
s
ure r
e
b
a
se on update is always tr
i
ggered
.
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spe
a
l
m
a
n
Made rebasing local things o
n
remote
c
hanges bef
o
re
.
.
.
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spe
a
l
man
actu
a
l
l
y
do what the last commit promis
e
d
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spe
a
lm
a
n
mergefrommaster is l
e
ss loud
commit
|
commitdiff
|
tree
2007-11-20
C
alvin
Sp
e
a
l
man
more
fixes and better path ge
n
eration for hook
s
commit
|
commitdiff
|
tree
2007-11-19
Calvin Sp
e
alma
n
Many fixes includi
n
g
better merge to m
a
s
t
er an
d
s
marter
.
.
.
commit
|
commitdiff
|
tree
2007-11-19
Calvin
S
pealman
Dont chan
g
e if already in
a
branch
commit
|
commitdiff
|
tree
2007-11-19
Cal
v
in Spealm
a
n
stashi
n
g dirty working copy
commit
|
commitdiff
|
tree
2007-11-17
C
a
lvin Spealman
eof
commit
|
commitdiff
|
tree
2007-11-17
Ca
l
vin Spealman
make mergebranch e
x
ecutabl
e
commit
|
commitdiff
|
tree
2007-11-15
Calvin Speal
m
an
Even more descr
i
ptive
commit
|
commitdiff
|
tree
2007-11-15
C
a
lvin Spealman
More d
e
scriptive merg
i
ng
c
o
mm
e
nts
commit
|
commitdiff
|
tree
2007-11-15
Cal
v
in Spealman
Only do
rebase dir
t
y br
a
nch whe
n
needed
commit
|
commitdiff
|
tree
2007-11-14
Calvin
S
pealman
Fetch more for up
d
ates
commit
|
commitdiff
|
tree
2007-11-14
Calvin Spe
a
lma
n
S
tash be
f
ore
r
e
base
commit
|
commitdiff
|
tree
2007-11-13
Ca
l
vin Sp
e
alman
Actually compare
t
he right th
i
ngs for the c
h
a
nged
file
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spealman
bugfix
.
eof
commit
|
commitdiff
|
tree
2007-11-13
Cal
v
i
n
S
pealman
Mor
e
expressive updati
n
g
commit
|
commitdiff
|
tree
2007-11-13
Ca
l
vin S
p
ealman
T
h
i
s
is be
t
ter
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spealm
a
n
Not su
r
e if
t
his helps
commit
|
commitdiff
|
tree
2007-11-13
Calvin
S
p
ealman
M
ake me
r
gefrommaster
e
xecutable and up
d
ate
mergebranch
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Cal
v
in Spea
l
man
Ad
d
helper to merge master into th
e
current bra
n
ch
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
C
a
lvin Spealm
a
n
Fix message
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Igno
r
e some
stuff
commit
|
commitdiff
|
tree
2007-11-12
C
a
lvin Spealman
Make sure we dont
create
a
n
e
xisting branch
commit
|
commitdiff
|
tree
2007-11-12
Calvin Sp
e
alm
a
n
Some quicker exiti
n
g o
n
problem
s
in
r
e
basebranc
h
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spea
l
man
Moved into bin
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
push and pull tags m
o
re
t
o
make
s
ure they sta
y
i
n
s
y
nc
commit
|
commitdiff
|
tree
2007-11-12
Cal
v
in
Spealman
Fixup merge scrip
t
commit
|
commitdiff
|
tree
2007-11-12
Cal
v
in Spealma
n
Dont force the push
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Mer
g
e in m
a
ster chan
g
es be
f
ore commiting
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Rename end
b
ranch to merge
b
r
anc
h
and
d
o
nt
d
elete afte
r
.
.
.
commit
|
commitdiff
|
tree
2007-11-12
Calvi
n
Sp
e
alman
Remo
v
e i
n
stallation of updated scr
i
pts
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Default reba
s
e
-
targe
t
to
m
a
ster
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Only e
n
d a branch if its r
e
base is
complete
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealm
a
n
Upd
a
te
b
efore commit
t
i
n
g and only com
m
it if all update
s
.
.
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin
Sp
e
alman
O
verwrit
e
remote
branch even if its
n
ot an an
c
est
o
r
.
.
.
commit
|
commitdiff
|
tree
2007-11-09
Calvin Spe
a
lman
Separate
d
rebas
i
ng helper an
d
branch terminating
.
Update
.
.
.
commit
|
commitdiff
|
tree
2007-11-09
Cal
v
in Spealman
Replace
pa
t
hs with origin and make sure to
f
etch updated
.
.
.
commit
|
commitdiff
|
tree
2007-11-08
Calvi
n
Spealman
C
le
a
n
me
s
s
a
g
e
s
commit
|
commitdiff
|
tree
2007-11-08
Ca
l
vin
Spe
a
l
m
an
o
rigin, not d
i
rect uri
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealman
Add more s
c
ripts
commit
|
commitdiff
|
tree
2007-11-08
Calvi
n
Spea
l
man
endbra
n
ch is a
l
ot lot lot
sm
a
rter now
.
Rerun it
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealman
Initial checkin o
f
the scrip
t
s pulled from th
e
so
c
i
alser
v
e
.
.
.
commit
|
commitdiff
|
tree