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 Spealman
Implement parent
b
ran
c
hing
.
Track who
a
branch comes
.
.
.
commit
|
commitdiff
|
tree
2007-12-04
Calv
i
n Spealman
Make
su
r
e rebasing wo
r
k
s
whe
n
t
h
e
re are new lo
c
al an
d
.
.
.
commit
|
commitdiff
|
tree
2007-12-04
Calvin Speal
m
an
Can
d
o a dryrun a
n
d is
v
erbose about what
i
s merged
commit
|
commitdiff
|
tree
2007-11-30
Calvin Spealman
H
a
ndle ab
o
rt case for com
m
it better
a
nd leave in m
a
s
t
er
.
.
.
commit
|
commitdiff
|
tree
2007-11-29
Ca
l
vin Spealman
Dont reb
a
se if
you dont
c
om
m
it!
commit
|
commitdiff
|
tree
2007-11-29
Calvin S
p
ealman
Merge in dirt
y
chang
e
s more
saf
e
ly
commit
|
commitdiff
|
tree
2007-11-29
Calvin Spealman
Hook
fixes an
d
much f
a
ster
c
ommit
b
ranch
commit
|
commitdiff
|
tree
2007-11-20
Calvin Sp
e
alman
Cal
l
hook for po
s
t-change-branch
commit
|
commitdiff
|
tree
2007-11-20
Cal
v
in
S
pealman
Determine completion more properly
commit
|
commitdiff
|
tree
2007-11-20
Cal
v
in Spealman
Try to
o
nly bail
reb
a
se if there i
s
no
d
iff
commit
|
commitdiff
|
tree
2007-11-20
C
a
lvin Spealman
Handle rebase c
a
ses mor
e
proper
l
y
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealman
D
ont try to add a target branch to commit
.
onl
y
commit
b
ranch
.
.
.
commit
|
commitdiff
|
tree
2007-11-20
Cal
v
in S
p
ealman
Mak
e
sure
r
eba
s
e on
u
pdate
is al
w
a
ys triggered
.
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spealman
M
ade rebasin
g
local things
o
n
r
e
mote ch
a
n
ges before
.
.
.
commit
|
commitdiff
|
tree
2007-11-20
C
a
lvin S
p
ea
l
man
a
c
tu
a
ll
y
do what
the last commit prom
i
sed
commit
|
commitdiff
|
tree
2007-11-20
Calvin
S
pealman
mergefrom
m
as
t
er
i
s less loud
commit
|
commitdiff
|
tree
2007-11-20
Calvin Spe
a
lma
n
m
o
re fi
x
e
s
a
n
d better path
ge
n
eration
f
or hooks
commit
|
commitdiff
|
tree
2007-11-19
Calvin
S
pealm
a
n
Many f
i
xes i
n
cluding better merge to
m
aster and smarter
.
.
.
commit
|
commitdiff
|
tree
2007-11-19
C
a
l
vin Sp
e
alman
Dont cha
n
ge if
a
lready in a branch
commit
|
commitdiff
|
tree
2007-11-19
Calvin Spealman
s
t
a
shing
d
i
r
t
y
w
o
rking cop
y
commit
|
commitdiff
|
tree
2007-11-17
Calvin Spealman
eof
commit
|
commitdiff
|
tree
2007-11-17
Calvin Spealm
a
n
make merg
e
branch e
x
e
c
utable
commit
|
commitdiff
|
tree
2007-11-15
Calvin S
p
ealman
Ev
e
n more d
e
scri
p
tive
commit
|
commitdiff
|
tree
2007-11-15
Calvin S
p
ealman
More descriptive me
r
ging comments
commit
|
commitdiff
|
tree
2007-11-15
Calvin
S
pealma
n
Only do rebase dirt
y
branc
h
w
h
en neede
d
commit
|
commitdiff
|
tree
2007-11-14
Cal
v
in Spealman
Fetch m
o
re for u
p
dates
commit
|
commitdiff
|
tree
2007-11-14
Cal
v
in Spe
a
lman
Stash before rebase
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spealman
Actually com
p
a
re the right things for
the changed file
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spealman
bugfix
.
eof
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spealman
More exp
r
e
ssi
v
e updating
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spe
a
lman
This is
b
e
t
ter
commit
|
commitdiff
|
tree
2007-11-13
Calvin Spe
a
lman
Not sure if th
i
s
he
l
ps
commit
|
commitdiff
|
tree
2007-11-13
Calv
i
n
S
pe
a
lman
Make mergefrom
m
aster executa
b
le and upd
a
te mergeb
r
anch
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
Calv
i
n S
p
ealman
A
dd
hel
p
e
r
to
m
erge master into the current branch
.
.
.
commit
|
commitdiff
|
tree
2007-11-13
C
alv
i
n Spealman
Fix message
commit
|
commitdiff
|
tree
2007-11-12
C
a
lvin Spealman
Ignore som
e
stuff
commit
|
commitdiff
|
tree
2007-11-12
Cal
v
in Spea
l
man
Make sure
we dont create an e
x
i
sting b
r
anch
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Some quicker e
x
iting
on probl
e
ms in reba
s
ebranch
commit
|
commitdiff
|
tree
2007-11-12
Calvin
S
pealman
Moved into b
i
n
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
p
u
s
h and p
u
ll ta
g
s more
t
o m
a
ke
sure they sta
y
in sync
commit
|
commitdiff
|
tree
2007-11-12
Calvin Speal
m
a
n
Fixup merge scri
p
t
commit
|
commitdiff
|
tree
2007-11-12
Calvin Spealman
Do
n
t force the push
commit
|
commitdiff
|
tree
2007-11-12
C
a
lvin
S
pealman
M
er
g
e
in master
c
hanges be
f
ore c
o
m
m
iting
.
commit
|
commitdiff
|
tree
2007-11-12
Ca
l
vi
n
S
pealman
R
ename
e
n
d
b
ranc
h
to me
r
g
ebran
c
h and dont dele
t
e after
.
.
.
commit
|
commitdiff
|
tree
2007-11-12
Cal
v
in
S
pealman
Rem
o
ve installation of updated scri
p
ts
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin
Spe
a
lman
De
f
a
u
l
t rebase-target to ma
s
ter
.
commit
|
commitdiff
|
tree
2007-11-12
Ca
l
vin Spealman
O
n
l
y end a b
r
anch if its rebase is c
o
m
plet
e
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin
S
pealman
U
p
da
t
e befor
e
committing and only commit if
all
updates
.
.
.
commit
|
commitdiff
|
tree
2007-11-12
Calvin Sp
e
alman
Overwrite remote branch even if its n
o
t
an ance
s
tor
.
.
.
commit
|
commitdiff
|
tree
2007-11-09
Calvin Spealman
Separ
a
ted rebasing help
e
r and branch te
r
m
i
nating
.
Update
.
.
.
commit
|
commitdiff
|
tree
2007-11-09
Ca
l
vin Spealman
Replace p
a
ths
w
ith o
r
igin
and make
sure t
o
fe
t
ch up
d
ated
.
.
.
commit
|
commitdiff
|
tree
2007-11-08
C
alvin Spealman
Clean
m
essages
commit
|
commitdiff
|
tree
2007-11-08
C
a
lvin Spealman
o
r
igi
n
, not direct uri
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealman
Add mo
r
e
s
cript
s
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spe
a
lm
a
n
endbran
c
h
is
a lot
l
ot lo
t
smarte
r
n
o
w
.
Rerun it to
.
.
.
commit
|
commitdiff
|
tree
2007-11-08
Calvin Spealman
Initial checkin of the script
s
pull
e
d from
t
he socialserve
.
.
.
commit
|
commitdiff
|
tree