repo.or.cz
/
git-rebase2.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
FIX: parsing quoted comment
2016-08-13
M
ax Kirillov
+
g
i
t_fetch_commit
s
commit
|
commitdiff
|
tree
2016-08-13
Max Kiri
l
l
o
v
+funcs
commit
|
commitdiff
|
tree
2016-08-13
Max Kiril
l
ov
+
make_merge_steps
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillov
+build_rebase_
s
e
q
uence
commit
|
commitdiff
|
tree
2016-08-13
M
a
x
Kiril
l
ov
+wri
t
e
F
i
le
commit
|
commitdiff
|
tree
2016-08-13
Max Kirill
o
v
+comment
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillov
+
p
ick
commit
|
commitdiff
|
tree
2016-08-13
Max Kiril
l
ov
+sync_head
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillo
v
+merge_new
commit
|
commitdiff
|
tree
2016-08-13
M
a
x Kirillov
+
m
e
rg
e
commit
|
commitdiff
|
tree
2016-08-13
Max Kir
i
llov
no explicit lifting
a
nymore
commit
|
commitdiff
|
tree
2016-08-13
Max Kiril
l
ov
used MonadRe
a
der
commit
|
commitdiff
|
tree
2016-08-13
Max Ki
r
ill
o
v
us
e
m
t
l for sta
t
e
commit
|
commitdiff
|
tree
2016-08-13
Max Kiri
l
l
ov
TRY: us
e
ContT
commit
|
commitdiff
|
tree
2016-08-13
Max K
i
r
i
llov
+run_st
e
p do
n
e
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillov
igno
r
e
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillov
+part of run_st
e
p()
commit
|
commitdiff
|
tree
2016-08-13
Ma
x
Kirillov
+abort_rebase
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillo
v
+run_rebase
commit
|
commitdiff
|
tree
2016-08-13
Max
Kirillov
+run_continue
commit
|
commitdiff
|
tree
2016-08-13
M
ax Kirillov
implement verify_ma
r
ks
commit
|
commitdiff
|
tree
2016-08-13
Max Ki
r
illov
IMPL: writing
commit
|
commitdiff
|
tree
2016-08-13
M
a
x Kirillov
IMP
L
: writing more
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillov
fixu
p
:
fix build
commit
|
commitdiff
|
tree
2016-08-13
Max
K
i
rillov
IMPL PARTIAL
commit
|
commitdiff
|
tree
2016-08-13
Max
K
irillov
IMPL: sta
r
t main_
r
un
commit
|
commitdiff
|
tree
2016-08-13
Max
K
i
r
i
ll
o
v
fixup: no decl
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillov
FIX: guard compile
s
commit
|
commitdiff
|
tree
2016-08-13
Max Kirillo
v
PART
I
AL
:
r
e
w
r
iting
commit
|
commitdiff
|
tree
2016-08-13
Max Kir
i
llov
cleanup cabal
a bit
commit
|
commitdiff
|
tree
2016-08-13
Max K
i
rillov
init
h
askell pr
o
je
c
t
commit
|
commitdiff
|
tree
2016-02-09
M
ax Kir
i
l
l
ov
git-rehi opt
i
m
i
satio
n
:
do
not save todo while going
.
.
.
commit
|
commitdiff
|
tree
2016-02-09
Max Kiril
l
o
v
M
e
rge `rename`
commit
|
commitdiff
|
tree
2016-02-08
Max Kirill
o
v
g
h-3
5
: rena
m
e to git-
r
ehi
commit
|
commitdiff
|
tree
2015-10-28
Max K
i
rillov
fix parsing merge op
t
ions with many argu
m
ents
commit
|
commitdiff
|
tree
2015-10-28
Max Kirillov
Test case for fai
l
ure
commit
|
commitdiff
|
tree
2015-05-15
Ma
x
Kirillo
v
gh-3
1
mo
r
e
u
ser-resolvab
l
e
c
ases without
st
a
c
k
tra
c
e
commit
|
commitdiff
|
tree
2015-05-15
Max
Kir
i
llov
gh-31 do not
a
ls
o
output line whi
l
e
d
yin
g
commit
|
commitdiff
|
tree
2015-05-07
Max Kirillo
v
gh-38: a
d
d
-
-curr
e
nt operatio
n
commit
|
commitdiff
|
tree
2015-05-07
Max Kirillov
gh-36: merge fix
commit
|
commitdiff
|
tree
2015-05-07
Max K
i
ri
l
lo
v
g
h-36: fix test
a
fter new
feature
commit
|
commitdiff
|
tree
2015-03-20
Max Kirillov
g
h
-36 TRY: in
t
er
p
r
e
t ~1
m
ore wi
d
e
l
y
commit
|
commitdiff
|
tree
2015-03-20
M
ax Kirillov
gh-36
TEST: add inte
g
r
a
t
ion
t
ests
commit
|
commitdiff
|
tree
2015-03-20
M
ax Kirillov
gh-36 i
f
source
_
from s
p
ecified as
ref~1, a
d
d
r
ef to
.
.
.
commit
|
commitdiff
|
tree
2015-03-19
Max Kiril
l
ov
g
h-31 do not
output stack
commit
|
commitdiff
|
tree
2015-03-19
M
ax Kir
i
llov
TRY: f
a
st-import base
d
test reposi
t
ory
commit
|
commitdiff
|
tree
2014-12-20
Max K
i
r
illov
IMPL: al
l
ow usin
g
c
o
m
m
ents unquote
d
in
t
he
end
of todo
.
.
.
commit
|
commitdiff
|
tree
2014-12-20
Max
Kirillov
F
I
X:
add space bet
w
e
en
`
#`
a
nd
c
o
m
men
t
t
ext in
for
m
at
commit
|
commitdiff
|
tree
2014-09-07
Max Kiri
l
lov
IMP
L
: write commit messa
g
es
t
o
comments f
o
r reuse
commit
|
commitdiff
|
tree
2014-09-07
Max Kir
i
llov
REFAC
T
OR: read whole mess
a
ge bod
y
instead of just subject
commit
|
commitdiff
|
tree
2014-09-07
Max Kirillo
v
REFACTOR:
use \0 as s
e
p
a
rat
o
r for
c
o
mmi
t
s
commit
|
commitdiff
|
tree
2014-09-07
Max
K
irillov
IMPL: add help
commit
|
commitdiff
|
tree
2014-09-07
Max
K
irillov
T
E
ST:
t
est cancelling
commit
|
commitdiff
|
tree
2014-09-07
Max Kirillov
IM
P
L:
a
dd comment
t
o parsed repre
s
entation
commit
|
commitdiff
|
tree
2014-09-06
Max Kirillov
FIX:
a
utovivification after
-
-continue when
m
arks ar
e
.
.
.
commit
|
commitdiff
|
tree
2014-07-23
Max Kirillov
FIX
:
re
s
e
t a
u
thorship when amending
commit
|
commitdiff
|
tree
2014-07-23
Max
K
irillov
IMPL: quoted comments
i
nto save_todo
commit
|
commitdiff
|
tree
2014-07-23
Max Kirillov
IMPL: implement qu
o
ting in read_todo
commit
|
commitdiff
|
tree
2014-07-23
Max Kirillov
TEST: add tests
a
bout
quoted
c
omment
commit
|
commitdiff
|
tree
2014-07-06
Max Kirillo
v
FIX: fix
m
istype in verify_ma
r
ks()
commit
|
commitdiff
|
tree
2014-07-06
Max
Kirillov
F
I
X:
properly concate
n
ate
commit
|
commitdiff
|
tree
2014-05-29
Ma
x
Kirillov
TEST: add fails check inste
a
d of
manual eval
commit
|
commitdiff
|
tree
2014-05-29
Max Ki
r
ill
o
v
TEST: add st
a
ck testing to cli
p
arsing also
commit
|
commitdiff
|
tree
2014-05-29
Max Kirillov
FIXUP:
a
bility to
a
l
l
o
w s
t
ack
commit
|
commitdiff
|
tree
2014-05-29
Max Kirillov
TRY: t
e
st for fail and
no stack
commit
|
commitdiff
|
tree
2014-05-27
Max Kirillov
gh-7: verif
y
in itest that stack trace is
n
ever
p
rinter
.
.
.
commit
|
commitdiff
|
tree
2014-05-27
Max
K
iril
l
ov
gh-21: verify marks after todo editing
commit
|
commitdiff
|
tree
2014-05-27
Max Kiri
l
lov
TEST:
no TODO anymo
r
e
commit
|
commitdiff
|
tree
2014-05-27
Max Kirillov
F
I
X: exit st
a
tus in c
a
se of in
v
alid TODO
commit
|
commitdiff
|
tree
2014-05-27
Max Kirillov
FIXU
P
:
a
rray derefere
n
c
e
commit
|
commitdiff
|
tree
2014-05-27
Max Kirillov
DOC: ad
d
TOD
O
about handling re
f
s in me
r
g
e
s
commit
|
commitdiff
|
tree
2014-05-27
Max Kir
i
llov
IMPL
:
verify mar
k
s after editin
g
TODO
commit
|
commitdiff
|
tree
2014-05-27
Max Kirillov
TEST: close input, to preve
n
t (
i
nf
i
n
i
te) re
t
ry
i
ng in
.
.
.
commit
|
commitdiff
|
tree
2014-05-19
Max Kiri
l
l
o
v
Revert "IMPL: get rid of the
additio
n
a
l
parent
s
call"
commit
|
commitdiff
|
tree
2014-05-18
M
a
x K
i
rillov
IMP
L
: get
rid of
the addition
a
l par
e
nts
c
al
l
commit
|
commitdiff
|
tree
2014-05-10
Max Kiril
l
ov
g
h-29: i
m
p
lemented
commit
|
commitdiff
|
tree
2014-05-10
Max Kirillov
TEST:
c
opy
inner_merge_after_merge to unit tests
commit
|
commitdiff
|
tree
2014-05-10
Max
Kirill
o
v
IMPL: r
e
move th
e
last
c
all of
g
it fro
m
m
ake_merge_steps()
commit
|
commitdiff
|
tree
2014-05-10
M
ax Kirillov
IMPL: store
a
lso tree
h
a
sh i
n
commit
i
nfo
commit
|
commitdiff
|
tree
2014-05-10
Ma
x
Kirillov
IM
P
L: remove ahash
p
icking du
r
ing m
e
rge
commit
|
commitdiff
|
tree
2014-05-10
Max Kiril
l
ov
TRY
:
workaround e
m
pty li
n
e return
e
d by git-show
commit
|
commitdiff
|
tree
2014-05-10
Max Kirillo
v
TEST: add test for case when merge c
o
mm
i
t taken by
.
.
.
commit
|
commitdiff
|
tree
2014-05-10
Max Kir
i
llov
Merge mast
e
r progress
commit
|
commitdiff
|
tree
2014-05-10
Max Kirillov
TMP
LOCAL: mark a
s
TODO
so
f
ar
commit
|
commitdiff
|
tree
2014-05-10
M
a
x Kirill
o
v
FIXUP: fix overwritin
g
t
he next task
commit
|
commitdiff
|
tree
2014-05-10
Max Kirillo
v
TRY: add FINALIZE_MERGEBASES sc
h
edu
l
e
s
tate
commit
|
commitdiff
|
tree
2014-05-10
Max
Kirillov
IMPL PARTIAL: fill
p
aren
t
s at start
commit
|
commitdiff
|
tree
2014-05-10
M
a
x Kirillov
FIX: fi
x
s
e
tting mark
after merge
commit
|
commitdiff
|
tree
2014-05-10
Ma
x
Kirillov
FIXUP: fix syn
t
ax
commit
|
commitdiff
|
tree
2014-05-10
M
ax Kirillov
FIX: fix inner erro
r
reportin
g
commit
|
commitdiff
|
tree
2014-05-10
M
ax Kiri
l
lo
v
FI
X
: fi
x
s
e
tting
m
ark
a
fter merge
commit
|
commitdiff
|
tree
2014-05-10
Max Kirill
o
v
R
E
F
ACTOR: generali
z
e git
_
fetch_commi
t
s() to allow arbi
t
ra
r
y
.
.
.
commit
|
commitdiff
|
tree
2014-05-10
Max Kirillo
v
TEST: still some
t
h
in
g
fails in resolve
r
commit
|
commitdiff
|
tree
2014-05-01
Max Kirillov
TEST:
check that
command do
e
s not fa
i
l with
stackrtace
commit
|
commitdiff
|
tree
2014-05-01
Max Kirillov
g
h-7:
f
ix cases visible in
t
e
sts
commit
|
commitdiff
|
tree
2014-05-01
Ma
x
K
irillov
FIX: also hand
l
e
failure in conti
n
u
e
commit
|
commitdiff
|
tree
2014-05-01
Ma
x
Kirillov
FIX:
ha
n
dle fastforwa
r
d
m
e
rge also
commit
|
commitdiff
|
tree
2014-05-01
M
a
x Kir
i
llov
F
I
XUP: mistype fixed
commit
|
commitdiff
|
tree
2014-05-01
Max
Kirillov
I
M
PL:
do n
o
t
c
ras
h
i
n c
a
se of con
f
licts
commit
|
commitdiff
|
tree
2014-05-01
Max Ki
r
i
l
lov
FIX: write e
r
rors t
o
stderr
commit
|
commitdiff
|
tree
next