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
Calvin S
p
ealman
I
mplemen
t
parent branching
.
Track who a bran
c
h comes
.
.
.
commit
|
commitdiff
|
tree
2007-12-04
Calvin Spealm
a
n
M
ake
s
ure rebasing works when there are new local
and
.
.
.
commit
|
commitdiff
|
tree
2007-12-04
Calvin Spealman
C
an do
a dryrun
a
nd is verbose a
b
ou
t
wh
a
t is merged
commit
|
commitdiff
|
tree
2007-11-30
Calvin Sp
e
alman
Handle abort cas
e
for commit
b
etter and leav
e
in master
.
.
.
commit
|
commitdiff
|
tree
2007-11-29
Calvin Spealman
Dont rebase
if you d
o
n
t
c
ommit
!
commit
|
commitdiff
|
tree
2007-11-29
C
alvin Spealman
Merge in dirt
y
changes more safely
commit
|
commitdiff
|
tree
2007-11-29
Calvin Spealman
Ho
o
k fix
e
s and much faster
commitbranch
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealman
Call hook for post-change-branch
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealma
n
Determi
n
e completion mor
e
prop
e
rly
commit
|
commitdiff
|
tree
2007-11-20
Calvi
n
Spealman
Try to only ba
i
l reba
s
e if there
is no di
f
f
commit
|
commitdiff
|
tree
2007-11-20
Calvin
S
pealman
H
a
ndle rebas
e
c
a
ses more properly
commit
|
commitdiff
|
tree
2007-11-20
Calv
i
n Spealman
Dont
t
ry t
o
add a
t
ar
g
et branc
h
to c
o
mmit
.
o
nly co
m
mitbranch
.
.
.
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealma
n
Make sur
e
rebase on
up
d
ate
i
s always
t
r
i
ggered
.
commit
|
commitdiff
|
tree
2007-11-20
Calvi
n
Spe
a
lman
Mad
e
rebas
i
ng loc
a
l th
i
ngs
on rem
o
te changes befo
r
e
.
.
.
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spea
l
m
a
n
actua
l
ly
do
w
hat
the
last commit promise
d
commit
|
commitdiff
|
tree
2007-11-20
C
a
lvin Spealman
m
ergefromma
s
ter is less loud
commit
|
commitdiff
|
tree
2007-11-20
Calv
i
n Spealman
m
ore fixe
s
and
b
e
tter path generation f
o
r ho
o
k
s
commit
|
commitdiff
|
tree
2007-11-19
Calvi
n
Spea
l
m
a
n
Many fix
e
s including bette
r
m
e
rg
e
to maste
r
and smart
e
r
.
.
.
commit
|
commitdiff
|
tree
2007-11-19
Calvin Spealm
a
n
Dont chan
g
e if alr
e
ady in a branc
h
commit
|
commitdiff
|
tree
2007-11-19
Calv
i
n
Spealma
n
stashing dirty
working copy
commit
|
commitdiff
|
tree
2007-11-17
Calvin Spealman
eof
commit
|
commitdiff
|
tree
2007-11-17
Ca
l
vin
S
pealman
m
a
ke mergebranch
e
xe
c
ut
a
ble
commit
|
commitdiff
|
tree
2007-11-15
C
alvin Spealman
Even more descriptive
commit
|
commitdiff
|
tree
2007-11-15
Calvin Sp
e
alman
Mor
e
d
escriptive merging commen
t
s
commit
|
commitdiff
|
tree
2007-11-15
Calvin Spea
l
man
Onl
y
d
o rebase di
r
ty
branch
when
needed
commit
|
commitdiff
|
tree
2007-11-14
C
a
l
v
i
n
Spealm
a
n
Fetch more for updat
e
s
commit
|
commitdiff
|
tree
2007-11-14
Calvin Spealman
S
t
a
s
h b
e
f
ore rebase
commit
|
commitdiff
|
tree
2007-11-13
C
alvin
S
p
ealman
A
c
t
ually compare t
h
e right
t
h
ing
s
for the chan
g
ed f
i
le
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
C
a
lvin Spe
a
lman
bu
g
fix
.
eof
commit
|
commitdiff
|
tree
2007-11-13
Cal
v
in Spealman
More expres
s
ive updating
commit
|
commitdiff
|
tree
2007-11-13
Cal
v
in S
p
ealman
This i
s
bette
r
commit
|
commitdiff
|
tree
2007-11-13
C
a
lvin Spealman
Not s
u
re if this helps
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spealman
M
a
ke mergefr
o
mmaste
r
ex
e
cutable an
d
u
p
date mergebranch
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spea
l
man
Add helper to merge master into
the current
branch
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Ca
l
vin Sp
e
alman
Fix messag
e
commit
|
commitdiff
|
tree
2007-11-12
C
alvi
n
Spealman
Ignore some stuff
commit
|
commitdiff
|
tree
2007-11-12
Calvin Sp
e
a
l
man
Make sure we dont create
a
n exi
s
ting br
a
nch
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Some quic
k
e
r
exit
i
ng on prob
l
e
m
s in rebasebranc
h
commit
|
commitdiff
|
tree
2007-11-12
C
a
l
vin S
p
ealman
M
ove
d
i
n
to bin
commit
|
commitdiff
|
tree
2007-11-12
Calvin
S
pealman
push and pull tags
m
ore to
m
a
k
e sure they stay
i
n sync
commit
|
commitdiff
|
tree
2007-11-12
Ca
l
vin
S
p
ea
l
m
a
n
Fixup merg
e
script
commit
|
commitdiff
|
tree
2007-11-12
Calvi
n
Spealman
Dont for
c
e the
push
commit
|
commitdiff
|
tree
2007-11-12
Calvin
S
pea
l
man
Merge in m
a
s
t
er
c
hange
s
before com
m
iting
.
commit
|
commitdiff
|
tree
2007-11-12
Cal
v
i
n Sp
e
al
m
an
Rename e
n
dbranch to mergebranch and dont delete aft
e
r
.
.
.
commit
|
commitdiff
|
tree
2007-11-12
C
a
lvin
S
pealman
R
e
m
o
ve installatio
n
of up
d
ated scripts
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin S
p
e
a
l
m
an
Default
r
ebase-ta
r
get to master
.
commit
|
commitdiff
|
tree
2007-11-12
C
alv
i
n Spealman
O
nl
y
e
n
d a bran
c
h i
f
its rebase is complete
.
commit
|
commitdiff
|
tree
2007-11-12
C
a
lvin S
p
e
alman
Update
b
e
f
ore committing an
d
only commit
i
f all updates
.
.
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealm
a
n
Over
w
rite remote
branc
h
even if i
t
s not an ancestor
.
.
.
commit
|
commitdiff
|
tree
2007-11-09
C
a
lvin Spealman
Separ
a
ted reba
s
in
g
helper and branch te
r
minating
.
Update
.
.
.
commit
|
commitdiff
|
tree
2007-11-09
Ca
l
v
i
n Spealm
a
n
Replace paths with ori
g
in and make sure t
o
fetc
h
upda
t
ed
.
.
.
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealman
C
lean messages
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealman
o
r
igin,
not d
i
rect
u
r
i
commit
|
commitdiff
|
tree
2007-11-08
Cal
v
in
Spe
a
lm
a
n
Add more s
c
ri
p
ts
commit
|
commitdiff
|
tree
2007-11-08
C
a
lvi
n
Spealma
n
endbran
c
h is a lot lot
lot smarter
no
w
.
Rer
u
n it to
.
.
.
commit
|
commitdiff
|
tree
2007-11-08
C
alvin Spealman
In
i
tial c
h
eckin of the sc
r
i
pts
p
ul
l
ed from th
e
socialse
r
ve
.
.
.
commit
|
commitdiff
|
tree