repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
receive-pack: drop "n/a" on unpacker errors
2012-08-30
Marti
n
von
Z
we
i
gbergk
cherry
-
p
i
c
k
/revert
:
respect order o
f
revisi
o
ns to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
r
tin von Zweigbergk
demonstrate br
o
ken
'
git cherry-
p
i
c
k
t
hre
e
one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in von Zweigberg
k
teach lo
g
--no-walk=un
s
o
r
ted,
w
hich avoids s
o
r
t
i
ng
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zweigbergk
add tests for 'git
r
eba
s
e -
-
keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Zweig
b
e
rgk
add test case for rebase of
emp
t
y c
o
mmit
commit
|
commitdiff
|
tree
2012-06-26
Ma
r
t
i
n von Zweigberg
k
am: d
o
n't c
a
ll mailinfo if $rebas
i
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
r
t
i
n von Zweig
b
ergk
am --rebasing:
get patch body from comm
i
t
,
not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase
-
-root: pri
n
t
u
sage o
n
too
m
a
n
y
args
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
o
n Zwei
g
bergk
reb
a
se: don't source gi
t
-
sh-se
t
up
t
wice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweig
b
e
r
gk
t
3
401: use test_commit in s
e
tup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigberg
k
t34
0
1:
mo
d
e
r
nize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zwei
g
bergk
am:
don
'
t
p
ersist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
weigbergk
r
e
mot
e
:
only u
p
date remote-tracking
b
ranch if
u
pdat
i
ng
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin v
o
n Zwe
i
gbergk
remote renam
e
:
warn when refspec wa
s
no
t
updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von Zweigberg
k
remote: "rename o
foo" should not rena
m
e
ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zweig
b
ergk
remote: write co
r
rect
f
etch spe
c
w
hen renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zw
e
igbergk
gitk: Show modifi
e
d files with separate wor
k
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Z
w
eigbergk
gitk: Si
m
plify ca
l
cu
l
ation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von
Zweig
b
e
r
gk
gitk
:
Run '
g
it
r
ev
-
p
a
rse --git
-
di
r
' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von
Zweig
b
e
rgk
gitk
:
Put
temporar
y
directory i
n
si
d
e
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
vo
n
Zweigbergk
gitk: Fix
"Exter
n
al diff" with
s
eparate work
t
ree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n vo
n
Zweigbergk
gitk: Fix
"
b
lame parent co
m
mi
t
"
w
i
th separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
ar
t
in
v
on Z
w
eigber
g
k
gitk
:
Fix
"sho
w
o
r
i
g
i
n of this
l
ine" with s
e
parate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von
Zweigbergk
gitk
:
Fix fi
l
e h
i
ghlight when
r
un in subd
i
rectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von
Zwe
i
g
b
e
rgk
rebase: cla
r
ify "
r
e
s
t
o
re th
e
original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
art
i
n
v
on Zweigbergk
Document
a
tion: use
[
vers
e
] fo
r
SY
N
OPS
I
S sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Mart
i
n
von Zw
e
igbergk
dif
f
core-rena
m
e: don't cons
i
d
er u
n
m
e
rged path
a
s
source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
artin von Zw
e
igbergk
rebase: define
o
p
t
i
o
ns
in OPTIONS_
S
PEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin
von Zweigbergk
Makef
i
le: do not ins
t
all sour
c
e
d
r
eb
a
se scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n von Zweigbergk
mergetool: don't skip modify/
r
e
move con
f
lic
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin vo
n
Zwe
i
gbergk
r
e
r
e
r
e "rema
i
ning"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: us
e
@{upstrea
m
} if
n
o
upstream spec
i
f
i
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
a
s
e -
i
:
remove unnecessary state rebase-roo
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase -
i
:
d
on't re
a
d unus
e
d
v
ari
a
b
le p
r
eserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
gi
t
-r
e
b
a
s
e
--
a
m
: remove
unnecessar
y
-
-3
w
ay
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwei
g
b
e
rg
k
rebase -
m
: don't pri
n
t exi
t
code 2
when merg
e
fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von
Zw
e
igbergk
reba
s
e -m: remem
b
er all
o
w
_rerere_autoupdat
e
optio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weig
b
ergk
rebase: reme
m
be
r
stra
t
egy a
n
d str
a
tegy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
ei
g
bergk
reb
a
se: r
e
member verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigb
e
rgk
r
eb
a
s
e
:
e
xtract
co
d
e
for
w
riting basic st
a
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von
Z
weigbergk
r
e
base: factor
o
ut sub c
o
mmand handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
ei
g
bergk
reba
s
e: make -v a tiny bi
t
more v
e
r
bose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigb
e
rgk
rebase -
i
: al
i
g
n
v
ar
i
able names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Z
w
eigbergk
rebase: s
h
ow consistent c
o
nflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
i
n von Zweigbergk
rebase: extra
c
t am
cod
e
to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwei
g
b
e
rgk
rebase:
extract me
r
ge code to ne
w
sour
c
e fil
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
eigbergk
rebase: re
m
ove $br
a
nch
as synonym for $orig_he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von
Z
weigbergk
re
b
ase:
fact
o
r
out reference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
wei
g
bergk
reba
s
e -i: support -
-
s
tat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwei
g
bergk
rebase: reorder va
l
idation
s
teps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
r
ebase: factor ou
t
call to pre
-
rebas
e
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
weigbe
r
g
k
rebase -
i
: remove now u
n
n
ec
e
ssary directory
c
heck
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor
o
u
t
clean work
t
ree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: f
a
ctor ou
t
com
m
a
n
d
l
i
ne opt
i
on processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
ei
g
bergk
r
e
b
a
se
:
a
li
g
n va
r
iable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: a
l
ign
v
ariable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
r
e
base: stricter ch
e
c
k
of
standalone
s
ub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwei
g
bergk
rebas
e
: a
c
t on command
l
in
e
outside parsing loo
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbe
r
gk
reba
s
e: improv
e
detec
t
i
o
n o
f
r
ebase in pr
o
gres
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwe
i
gb
e
r
gk
r
eba
s
e: re
m
ove u
n
used r
e
base state 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
w
e
ig
b
ergk
rebase: read state outsi
d
e loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: r
e
factor reading of st
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
r
eb
a
se: clearer name
s
for
director
y
vari
a
bles
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin vo
n
Zwei
g
b
e
rgk
completion: add miss
i
ng
co
n
figuratio
n
v
ariables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in von
Z
weigbergk
U
s
e reflog
i
n
'pu
l
l -
-
r
ebase
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
rti
n
v
o
n
Z
weigbergk
rebas
e
: only show sta
t
if configured t
o
true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Ma
r
ti
n
von Zweigber
g
k
rebase --abort: do not u
p
dat
e
bra
n
ch
r
e
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
a
rtin vo
n
Zweigber
g
k
rebase: s
u
pport --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin v
o
n
Z
w
e
igbergk
Docu
m
e
n
tatio
n
/
g
it-pull: clarify configuratio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweig
b
e
r
gk
rebase -
X
:
d
o
n
ot clobbe
r
s
t
r
a
t
egy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree