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 -i: clean error message for --continue after failed exec
2011-07-14
Martin von Zwe
i
gbergk
rebase: clari
f
y
"r
e
store the origin
a
l branc
h
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin
von
Z
w
e
igberg
k
Do
c
umentation: us
e
[verse] f
o
r
S
YNOPSIS
s
ections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Mar
t
i
n
von Zweigbergk
diffcore-
r
enam
e
: don't consider unmerged path
a
s
sourc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin
v
on Zweig
b
ergk
reb
a
se: define options in OPTIONS
_
SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
artin von
Z
w
e
ig
b
e
r
gk
Makefile:
d
o not ins
t
all
s
ourced re
b
ase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
mergetool:
d
on
'
t
s
kip modi
f
y/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Zweigbergk
rerere
"remain
i
ng"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbe
r
gk
re
b
a
se: use @{ups
t
ream} if
n
o
u
pstrea
m
specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zwe
i
gber
g
k
rebase
-
i:
r
e
move u
n
neces
s
a
ry state re
b
ase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase -i: don
'
t read unused variab
l
e pr
e
s
er
v
e
_
merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
von
Z
weigberg
k
g
i
t-
r
ebas
e
--
a
m:
r
emove
unnece
s
sary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
re
b
a
s
e -m: don
'
t p
r
int
exit co
d
e
2 when merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
we
i
gbergk
reb
a
s
e -m: re
m
ember a
l
lo
w
_
rerere_autoupda
t
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n
v
on Zwe
i
gber
g
k
reba
s
e: r
e
member strategy
and strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Z
w
eig
b
ergk
reb
a
se: remember ve
r
b
o
se optio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
reba
s
e
:
extr
a
ct code for writing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on Zweig
b
ergk
rebase: fact
o
r o
u
t sub command
han
d
ling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
rebase: ma
k
e -
v
a ti
n
y bit more verb
o
se
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwe
i
g
b
e
r
gk
rebase
-
i: ali
g
n variable n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
reba
s
e
: sh
o
w
c
o
n
sistent co
n
flict resolu
t
ion h
i
nt
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbe
r
g
k
rebase: extract a
m
code to new
s
ource fi
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigbergk
rebase: ex
t
ract merge c
o
de to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igber
g
k
rebase: r
e
move $branch as s
y
nonym
for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gber
g
k
rebase -i: support --sta
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase:
f
actor out
call to
pr
e
-
r
ebas
e
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: f
a
ctor out c
l
ea
n
wor
k
tree
chec
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigbergk
reba
s
e:
f
a
c
t
or out reference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwei
g
bergk
r
e
ba
s
e: reorde
r
v
alid
a
ti
o
n
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbergk
rebase -i: remove now unnecessary directory
c
hecks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: factor out command line option processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
ei
g
b
ergk
rebas
e
: align
v
ariable conte
n
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eig
b
ergk
rebase:
align variable
nam
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
reb
a
se: str
i
cter
c
heck
o
f s
t
andalon
e
sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: a
c
t on command line o
u
t
s
ide par
s
i
n
g loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: improv
e
detection of rebas
e
in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Z
w
eigber
g
k
rebase:
r
emove
u
nused rebase s
t
ate 'prev_head
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zweigbergk
rebas
e
: read state outs
i
de loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zwe
i
gbergk
rebase: refacto
r
reading o
f
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin vo
n
Zw
e
ig
b
ergk
rebase: clear
e
r names for di
r
ectory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin v
o
n
Z
wei
g
be
r
gk
co
m
pletion:
a
d
d
missing conf
i
gurat
i
on
v
a
r
iables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n Zwei
g
bergk
Use reflog in '
p
u
l
l
-
-re
b
as
e
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
t
i
n von Zweigbe
r
g
k
rebase: o
n
l
y
s
how stat if conf
i
gured
t
o true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Ma
r
t
i
n von
Zwei
g
bergk
r
e
base --
a
bort:
d
o not
update branch
r
e
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin v
o
n Zweigbe
r
gk
r
ebase: support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Mar
t
in von Zwei
g
be
r
gk
Docume
n
ta
t
ion/git-p
u
ll: clari
f
y co
n
figuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
a
rti
n
von Z
w
e
i
gbergk
rebase -X: do not clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree