repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: show consistent conflict resolution hint
2011-02-10
M
artin
von Zweigber
g
k
reba
s
e:
s
how consis
t
e
n
t c
o
nflic
t
r
e
s
o
lut
i
on
hint
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: ext
r
act am c
o
de to
n
ew source file
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zw
e
igbe
r
gk
reb
a
se: extract merge code t
o
new source file
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Z
w
e
i
gbergk
re
b
ase: remove
$
branch
a
s sy
n
o
n
ym for $ori
g
_head
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
bergk
rebase
-
i
: s
u
pp
o
r
t
--stat
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n
Zwe
i
gbergk
rebase: f
a
ctor ou
t
call to pre-reba
s
e hook
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
fac
t
o
r ou
t
clean work tr
e
e check
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
e
i
gber
g
k
rebase: factor out reference parsi
n
g
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
r
ebase
:
re
o
rder validation steps
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
-
i: remove now unnecessary d
i
rectory checks
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Z
w
e
i
g
bergk
rebase: f
a
c
tor ou
t
comma
n
d l
i
ne option pr
o
cessing
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
igber
g
k
r
e
base: align va
r
i
a
ble content
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zw
e
igbergk
rebase: align v
a
riable
names
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigbergk
re
b
ase
:
stricter c
h
eck
o
f st
a
ndalon
e
sub c
o
m
mand
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Zweigbergk
rebase
:
act on command li
n
e
o
utside
parsing
l
oop
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwei
g
be
r
gk
rebase: impro
v
e de
t
ection of reb
a
se in p
r
o
gress
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
weigbergk
r
ebase: remove unused r
e
base st
a
t
e
'prev_
h
ead'
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
ergk
r
e
ba
s
e:
r
ea
d
state o
u
tside loop
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: refacto
r
reading of state
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Z
w
e
i
gbergk
rebase: cle
a
rer name
s
f
or directory variab
l
es
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-12-21
M
a
rtin von
Z
weigbergk
co
m
pl
e
tion: add missing configuration var
i
ables
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin
von Zweigbe
r
g
k
U
s
e reflog in
'
pull
-
-
rebase
.
foo'
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-29
Martin vo
n
Zweigbergk
rebase: only show stat if configured to tr
u
e
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-24
Martin von Z
w
eig
b
er
g
k
rebase --
a
b
ort: do
not update branch
r
ef
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-23
Martin
von Zweigbergk
rebase: support --verify
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbergk
Documentation
/
git-pull: cl
a
rify configuration
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
r
e
base -X: do not clobber strategy
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
