repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add MYMETA.yml to perl/.gitignore
2011-09-12
Marti
n
von Zweigbergk
remote:
only update re
m
o
t
e-
t
racking branch
i
f updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Zweig
b
e
rgk
remo
t
e rename: warn when refspec was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin vo
n
Zweigbergk
rem
o
te: "ren
a
me o foo" should
no
t
rename ref "or
i
gin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zweigbergk
remote:
w
rite correct fetch spec when r
e
n
a
ming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbergk
rebas
e
: clarify "
r
est
o
re
t
h
e o
r
iginal branc
h
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin v
o
n
Zweigbergk
Docu
m
entation
:
use [vers
e
] for SYNOPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zwei
g
b
e
r
g
k
d
i
ffcore-ren
a
me: don't
c
o
nsider
unmerged p
a
t
h as
sou
r
ce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zwe
i
gbergk
rebase:
d
efine options in
O
PTION
S
_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweigbergk
Makefile: do not install sourced rebase
scr
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Marti
n
von
Zweigbergk
mergeto
o
l: don't
skip modi
f
y/remove
co
n
flicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
tin von Zweigbe
r
gk
rerere "remain
i
ng"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zw
e
igber
g
k
re
b
a
s
e:
u
s
e @{upstream} i
f
n
o upstream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zw
e
ig
b
e
r
g
k
reba
s
e -i
:
remove unne
c
essary s
t
ate r
e
base-ro
o
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
ebase -i: don't read unused v
a
riable pre
s
e
rve_merg
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
git-rebase--am: remove unnecessary
--3w
a
y option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase
-
m: don't print exit code 2 whe
n
merge f
a
i
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbe
r
gk
re
b
ase -m: remember allow_rerere_autoupdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: r
e
member stra
t
egy and
strateg
y
op
t
ions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbe
r
gk
rebase:
r
ememb
e
r verbose op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Z
w
e
i
gbergk
rebase: extra
c
t
code
f
or writi
n
g basic s
t
ate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
reba
s
e: factor out sub command han
d
l
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
reb
a
se: make
-
v a ti
n
y b
i
t more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
r
ebase -i: align variable
n
ame
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase: show consistent con
f
l
ict resolution
hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
rebase
:
extract am
code to
n
e
w source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
reb
a
se: extract
m
erge
c
ode to new
s
ou
r
ce fil
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
r
e
base: remove $b
r
anch as
synonym for $or
i
g_he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
o
n Zwei
g
bergk
rebase
-
i: su
p
por
t
--stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zw
e
igbe
r
gk
re
b
as
e
: factor ou
t
call to pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
ig
b
ergk
rebase: factor ou
t
c
l
ea
n
work tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
w
eigbergk
reb
a
se: factor
o
u
t ref
e
re
n
c
e parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Z
w
eigbergk
rebase
:
re
o
rd
e
r validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
reb
a
se -i: remove now unn
e
c
essary director
y
check
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zweigbergk
rebase: fa
c
tor out command
line option processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zwei
g
bergk
rebase:
a
l
ig
n
variable c
o
ntent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
r
eba
s
e
:
a
l
ig
n
variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igbergk
r
ebase:
s
tricter check o
f
st
a
nda
l
one sub com
m
a
nd
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zw
e
igbergk
r
e
base:
a
ct on
c
omma
n
d line outside p
a
rsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zwei
g
b
ergk
rebase: improve det
e
cti
o
n of rebas
e
in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: r
e
move unused rebase
s
t
a
te 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweig
b
e
rgk
rebase: read st
a
te outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase
:
refactor
reading
of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase: cl
e
arer names
f
o
r directory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
art
i
n
von Zw
e
i
g
bergk
com
p
letion: add missing con
f
igur
a
t
i
o
n var
i
able
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mart
i
n
von
Zweigbergk
Use reflog in 'pull --r
e
base
.
f
oo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n Zweigbe
r
gk
r
e
base: only s
h
ow
stat
if c
o
n
f
igured
to tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Marti
n
v
on Zwei
g
bergk
rebase
-
-a
b
ort
:
do not updat
e
br
a
nch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Mar
t
in von
Zweigb
e
r
gk
rebase:
s
upp
o
rt --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin
v
on Zweigbergk
Documentati
o
n/gi
t
-
p
u
l
l:
c
larify c
o
nfigurat
i
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
a
rtin von Zwe
i
gb
e
r
gk
rebase
-
X: do no
t
c
l
obber
st
r
ategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree