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 -i: don't read unused variable preserve_merges
2011-02-10
Marti
n
vo
n
Z
w
eigbergk
re
b
ase
-
i:
d
on'
t
r
ead unused
va
r
i
able pr
e
serve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweigbergk
git-
r
ebase--am: remove
unnecessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
r
e
base -m: don
'
t
print
exit code 2 when merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weig
b
ergk
reba
s
e -m: rem
e
m
ber
a
llow_rerere_auto
u
pdate op
t
i
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: remember
s
trategy and str
a
tegy
o
ptions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Z
w
eigbergk
re
b
as
e
: remember verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: ex
t
ract c
o
de for writi
n
g
b
asic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase
:
fact
o
r
o
ut sub command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwe
i
gbergk
r
e
b
a
s
e: mak
e
-v a tin
y
bit mo
r
e
v
e
r
bose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbergk
rebase -i: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
ergk
r
e
base: sh
o
w
consi
s
tent conflict res
o
lution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n vo
n
Z
w
eigbergk
rebase: e
x
tract
a
m
c
o
de to new sourc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n
v
o
n
Zweigberg
k
rebase: extract merge
c
o
de to new sourc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase: remov
e
$bra
n
ch as synonym for $orig
_
head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
o
n Zweigbergk
rebase -i:
s
upport
--stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
ergk
rebase:
f
actor
out call to pre-reba
s
e hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase:
factor o
u
t clea
n
w
ork tr
e
e check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebas
e
: factor o
u
t
r
efere
n
ce
p
a
rsin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
r
eorder validation st
e
ps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
r
ebas
e
-i: re
m
ove now unnecessary
d
irectory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
o
n
Zweigbergk
rebase: factor
o
ut
c
o
mmand line option processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
reba
s
e: a
l
ign va
r
iable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in vo
n
Zweigberg
k
re
b
as
e
: align var
i
able names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: stricter che
c
k of standalone sub co
m
mand
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
w
eigbergk
rebase: act
on comma
n
d line out
s
ide par
s
ing
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
re
b
ase: im
p
rove detec
t
i
o
n
of rebas
e
i
n
progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Z
w
eigberg
k
r
e
base: remove unused r
e
base state 'p
r
ev
_
head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
wei
g
be
r
gk
rebase: read state outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
e
rgk
rebase:
r
efacto
r
rea
d
ing of
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigber
g
k
rebase:
c
learer na
m
es for direc
t
ory var
i
able
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin
v
on
Zweigbe
r
gk
comp
l
e
t
ion: ad
d
missing
c
onfigurati
o
n var
i
ab
l
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in von Zweigbergk
Use reflo
g
in 'pull --reb
a
se
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zwei
g
bergk
rebase: only show stat if co
n
figured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin
von
Z
weig
b
ergk
r
ebase --
a
bort: do not up
d
ate
b
ranch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
ar
t
in von Zweigbergk
rebas
e
:
support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin v
o
n Z
w
e
i
gbergk
Documen
t
ation/git-pull: clarify configurat
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
artin von Zweig
b
e
rg
k
r
e
base -X
:
do
n
ot clobber strate
g
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree