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
add test case for rebase of empty commit
2012-06-27
M
artin
v
o
n Zweigber
g
k
add test
case for
rebase of empty
c
ommit
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zwe
i
gbergk
t34
0
1
:
use test_
c
ommit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbergk
t3401: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin
v
on
Z
wei
g
bergk
a
m
:
don't
p
e
r
sis
t
ke
e
pcr
flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin von Z
w
eigberg
k
remote: onl
y
u
p
d
a
t
e
remote-tracking branch if u
p
dati
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbe
r
gk
remote rename: warn whe
n
re
f
spec was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
artin von Zweigbergk
remote:
"
r
enam
e
o
foo" sh
o
uld not ren
a
m
e ref "or
i
gin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mart
i
n von Zweigbergk
r
e
mote: wr
i
te corre
c
t fetc
h
spec
w
hen
renamin
g
remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zweigbergk
gitk
:
Show modified files
w
i
t
h sep
a
rate
work tr
e
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
v
on Zw
e
igbergk
gitk: Si
m
plify calcula
t
i
o
n o
f
git
d
ir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigbergk
gitk: Run '
g
i
t rev-parse --
g
it-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zw
e
ig
b
ergk
gitk: Put
t
emporary d
i
re
c
tory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigbergk
gitk: Fix "Exte
r
nal dif
f
"
with separate work
t
ree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Z
weigbergk
gitk: Fix "blame parent
commi
t
" wi
t
h separa
t
e work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Z
w
e
i
gbe
r
gk
gitk: Fix "sh
o
w
o
rigi
n
of this line"
with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zweigbe
r
gk
g
i
t
k: Fix
f
ile highlight when run in subdir
e
c
t
o
r
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbergk
reba
s
e: cl
a
rify "restore the original
br
a
nch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Mar
t
in von
Z
weigber
g
k
D
o
cu
m
e
n
tation: u
s
e [
v
erse] for S
Y
NOPSIS sect
i
o
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zwei
g
bergk
diffcore-rename: don't co
n
s
ider
u
n
merged path as
s
ource
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
a
r
tin
vo
n
Zwe
i
g
b
e
rgk
r
eb
a
se: define
op
t
i
o
ns i
n
OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Mar
t
in v
o
n
Zweig
b
e
r
gk
Makefile: do
not
install
so
u
rced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zwe
i
gb
e
rgk
mergetool: don't ski
p
m
odify/r
e
move c
o
nflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin vo
n
Zweigbergk
rer
e
re "
r
emaining
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
r
e
base: use @{upstream}
if no upstrea
m
specif
i
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbe
r
gk
rebase
-i: re
m
ove u
n
neces
s
ary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zweigbergk
rebase -i: don't read un
u
sed variable
preserv
e
_mer
g
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
g
i
t-rebase--am: remove
u
nnecessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zw
e
igbergk
rebase
-m: don
'
t print exit code 2 w
h
en merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigber
g
k
rebas
e
-
m:
r
e
m
e
m
b
er allow_rerere_aut
o
update option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zweigb
e
rg
k
r
ebase: remember st
r
ategy and stra
t
egy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zw
e
igbe
r
gk
rebase:
remember verbose optio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigbergk
rebase: extrac
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 vo
n
Z
w
eigbergk
r
ebase:
factor
o
ut sub comm
a
nd handlin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
reba
s
e: make -v a ti
n
y
b
i
t
more verbos
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
we
i
gberg
k
rebase -i: align va
r
iable nam
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n Zweigbergk
rebase: show consi
s
tent
c
onflict
r
esol
u
tion h
i
nt
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on
Z
we
i
gberg
k
rebase: extra
c
t
a
m
c
ode t
o
new source f
i
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
bas
e
: extract me
r
g
e
co
d
e to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zw
e
igber
g
k
rebase
:
remove $br
a
n
c
h as s
y
nony
m
fo
r
$orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von
Z
weigber
g
k
rebase -i: s
u
ppo
r
t
-
-
s
t
at
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
rebase: f
a
ctor out ca
l
l
t
o pre-r
e
base ho
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
wei
g
berg
k
rebase: f
a
cto
r
ou
t
clea
n
w
ork tr
e
e c
h
eck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweig
b
er
g
k
rebase: factor out
r
eference pars
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von Zw
e
igb
e
rgk
r
e
ba
s
e
:
reorder validation st
e
p
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigber
g
k
rebase
-
i:
remove no
w
un
n
ecessary d
i
rect
o
ry check
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von Zweigber
g
k
re
b
ase
:
f
actor out
comma
n
d line
option proc
e
ssing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zw
e
igbergk
rebase: ali
g
n variabl
e
content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigber
g
k
r
ebase: align vari
a
ble name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
stricter
check
o
f stan
d
alone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwei
g
b
er
g
k
rebas
e
: act on
c
ommand
l
i
ne outside par
s
ing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
e
rgk
rebase: improve
d
etectio
n
of re
b
ase in prog
r
e
s
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
e
rgk
rebase:
r
emove unused rebase state '
p
rev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: rea
d
state outsi
d
e
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
we
i
g
b
ergk
rebase
:
refactor reading of st
a
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: clearer nam
e
s
for directory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin
v
on Zweigbergk
completion: add
m
issing
c
o
nfigura
t
ion variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Z
w
eigbergk
Use ref
l
o
g
i
n
'pull --
r
ebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
artin von Zweigbergk
r
e
base: only s
h
ow stat if
c
o
n
fig
u
red to tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zwe
i
gbe
r
gk
rebase --abort: do not upd
a
te
b
ranch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zwe
i
g
b
e
r
gk
reba
s
e
:
s
upport --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin
v
o
n Zweigbe
r
gk
Documentation/git-p
u
ll: clarify con
f
i
guration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Ma
r
tin vo
n
Zweigbergk
rebase -X
:
do
n
ot clobber str
a
t
e
gy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree