repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: define options in OPTIONS_SPEC
2011-03-05
Martin von Zweigbergk
rebase: de
f
ine options
in OPTIONS_
S
PEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Marti
n
von Z
w
eigb
e
rgk
M
akefile:
do
n
o
t
install sourced rebase s
c
rip
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in
von
Zweigbergk
rebase: use @{upstream} if
n
o upstrea
m
s
p
ecif
i
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e -i: remove unn
e
cess
a
ry state r
e
base-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zwei
g
bergk
rebase -i: don't r
e
ad unus
e
d variable pre
s
e
r
v
e_me
r
ge
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
git-rebas
e
--
a
m: remov
e
unne
c
essa
r
y --3way op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigbergk
rebase -
m
:
d
o
n't
p
rint exit code 2 when m
e
rge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
ergk
reb
a
se -m:
remember allow_rerere_auto
u
pda
t
e
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
vo
n
Zweig
b
ergk
rebas
e
: remembe
r
strat
e
g
y
a
n
d strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zwe
i
gbergk
rebase:
r
emember verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase:
extra
c
t co
d
e for writing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: fac
t
or out su
b
command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbergk
rebase:
m
ak
e
-v a tiny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigber
g
k
rebase -
i
: align vari
a
ble names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweig
b
ergk
re
b
ase: show consist
e
nt conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwei
g
bergk
rebase: extract am cod
e
to new source fi
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract merge c
o
de to
new s
o
urce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
r
ebas
e
: remo
v
e $
b
ranch as synonym for
$
o
r
ig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigberg
k
rebase -i: suppo
r
t --s
t
a
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
r
e
base: factor out call to pr
e
-rebase ho
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zw
e
igberg
k
rebase:
f
actor ou
t
clean work tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigber
g
k
rebase: factor out
reference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
von Zweigbergk
reb
a
se:
reorder validat
i
on
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigberg
k
re
b
as
e
-i: remove now unnec
e
ssary di
r
e
c
t
ory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
r
ebase: factor out command
line o
p
tion proces
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zw
e
igbergk
reb
a
s
e
: align variabl
e
c
o
ntent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigbergk
rebase: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebas
e
:
s
tric
t
er check
o
f
standalone
sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase
:
ac
t
on comman
d
line
o
utside par
s
ing lo
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase
:
improve detect
i
o
n of r
e
base in progres
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zwei
g
bergk
rebase: remov
e
un
u
s
ed
r
e
b
a
s
e
st
a
t
e 'prev_h
e
ad'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase: read state
o
u
tside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweig
b
ergk
rebase: refactor reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von
Zweigbergk
rebase: clearer names for directory va
r
iables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mar
t
i
n
vo
n
Z
w
e
i
gbergk
completion: add missing
c
onfiguration
var
i
ab
l
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
Use reflog in
'pull --rebase
.
f
o
o'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
r
ebase: o
n
ly s
h
ow stat
i
f
configured t
o
true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
a
rtin von Zweigbergk
rebase
--abo
r
t: d
o
n
o
t upda
t
e br
a
nch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
a
r
ti
n
von Z
w
eigbergk
rebase: suppo
r
t --verif
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Ma
r
tin von Zweigbergk
D
o
c
u
m
entation/gi
t
-pull: clarify configurati
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigb
e
rgk
reb
a
se -X: do not clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree