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
Merge branch 'tc/minix'
2011-07-14
Martin von
Z
weigb
e
r
g
k
rebase:
clarify "restore t
h
e ori
g
ina
l
branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zweig
b
ergk
Docum
e
nta
t
ion: use [verse] for SYNOPSIS section
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Z
w
eigbergk
diffcore-rename: don't
c
onsider unmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Ma
r
tin von Zweigb
e
r
g
k
rebas
e
: defin
e
options
i
n OPTIO
N
S_SPE
C
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin v
o
n
Zweigb
e
rgk
Makefile
:
do
n
o
t
i
n
stall sourced reb
a
se scr
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
ar
t
in vo
n
Zweigbergk
mergetool: don't skip m
o
dify/remove confli
c
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rti
n
von Zweigbergk
re
r
ere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zw
e
igbergk
rebase: use @{up
s
tream} i
f
no
u
pst
r
ea
m
specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zweigbergk
r
eba
s
e -i: remov
e
u
nnecessary state
rebas
e
-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: don'
t
read unused var
i
able
preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbe
r
gk
git-reba
s
e--am: remove unnecessary --3w
a
y option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase -
m
: don't pr
i
nt exi
t
code
2
when merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zwei
g
berg
k
rebas
e
-
m
:
r
e
member allow_rerer
e
_autou
p
d
ate op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: remember strat
e
gy and strategy optio
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igber
g
k
rebas
e
: remember verbos
e
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
v
o
n Zweigbe
r
gk
re
b
ase: extract code for writing ba
s
ic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: fact
o
r out sub command han
d
ling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
e
r
gk
r
e
bas
e
: make
-v a tiny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Z
w
eigbergk
rebas
e
-
i: align variable
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: s
h
ow consiste
n
t confl
i
ct resol
u
ti
o
n
h
int
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin v
o
n Zweigbergk
reba
s
e: ex
t
ract am cod
e
to new
sour
c
e file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase: e
x
tract merge code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase
:
re
m
ove $branch as s
y
no
n
ym fo
r
$o
r
ig_h
e
ad
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
v
o
n
Zweigbergk
rebase -i: su
p
po
r
t --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
w
ei
g
bergk
rebase: fac
t
or out call to pre
-
re
b
ase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbe
r
gk
rebase: factor
o
ut clean w
o
rk tre
e
check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in v
o
n Zweigb
e
r
g
k
rebase:
factor out refer
e
nce parsin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von Zweigbergk
rebase: re
o
rder validat
i
on steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: remove
n
ow
u
n
n
ecessary dir
e
ctory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase: fa
c
tor
o
ut comman
d
line opti
o
n processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigber
g
k
r
e
base: align v
a
ri
a
ble content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
eb
a
se: align varia
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweig
b
ergk
rebase
:
stricter check o
f
standalone s
u
b command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von Z
w
eigbergk
rebase
:
act on command li
n
e outsi
d
e
p
arsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigberg
k
reba
s
e:
i
mp
r
ove detection of reba
s
e in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zwei
g
be
r
g
k
rebase: re
m
ove unu
s
e
d
r
e
b
as
e
state '
p
re
v
_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
i
n
von Zweigbergk
rebase:
read
state ou
t
side loo
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zweigbergk
rebase: refactor
reading of
stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
on Zwe
i
gbe
r
gk
rebase: clearer name
s
for di
r
ectory variab
l
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zwei
g
ber
g
k
completion: ad
d
missing
c
o
n
f
iguration varia
b
les
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
ar
t
in vo
n
Zweigbergk
Use refl
o
g in 'pull --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
t
in von
Z
wei
g
be
r
gk
r
eb
a
se: only sh
o
w
stat if configured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
artin v
o
n Z
w
eigbergk
rebase --abort: d
o
n
ot up
d
ate br
a
nch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
art
i
n vo
n
Zweigbergk
re
b
ase: supp
o
rt --veri
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Marti
n
von Zweigb
e
rg
k
D
o
cumentation/git-
p
ull
:
clar
i
fy co
n
figuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin vo
n
Zweigbergk
rebase -X: do not clobber
s
trategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree