repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.12.1
2012-08-30
M
a
rtin
v
o
n Zwei
g
bergk
cherry-pick/re
v
e
r
t: respect
order o
f
re
v
isions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von
Z
weigbergk
d
e
m
onstrat
e
broken 'git che
r
r
y
-pick three one t
w
o
'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in
v
on Zweigbergk
teach lo
g
--no-wa
l
k=unsor
t
ed, which avoids sor
t
ing
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin vo
n
Zweigb
e
rgk
add tests
f
or 'git rebase
--ke
e
p-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Ma
r
tin von Zwe
i
gbergk
add test cas
e
for
rebase of em
p
ty com
m
it
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am: d
o
n't call
m
ailinfo i
f
$rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n
v
o
n
Zwei
g
ber
g
k
am
--re
b
asing: ge
t
pa
t
c
h
body from commit
,
no
t
from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zw
e
igbergk
r
e
base --root: print usage on t
o
o ma
n
y arg
s
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Z
weigbergk
rebase: don't
sour
c
e git-sh-se
t
up twice
commit
|
commitdiff
|
tree
2011-12-12
M
artin von Zweigbergk
t
3401: use test
_
c
o
mmit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Ma
r
tin
v
on Zweigbergk
t3401: modernize
s
t
y
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin vo
n
Zweig
b
er
g
k
am: don't per
s
i
st ke
e
p
cr
flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Zweigbergk
re
m
o
te: on
l
y
update rem
o
te-trac
k
in
g
branch if updati
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
t
i
n von Zweigbergk
remote rena
m
e: warn whe
n
r
efspec was not
u
pdated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zwe
i
gbergk
remote: "rena
m
e
o
fo
o
" should not r
e
name re
f
"o
r
i
gin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zwei
g
bergk
remo
t
e: write correc
t
fet
c
h spec when rena
m
ing remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Zweigbe
r
gk
git
k
: Show modified files with separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
v
o
n Zwei
g
be
r
gk
gitk: S
i
mplify cal
c
ul
a
tion of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Z
w
e
i
gb
e
rgk
gitk:
R
un 'gi
t
rev
-
pa
r
s
e
-
-git-dir'
o
nly once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin vo
n
Zw
e
igbergk
g
i
tk: Put temporary d
i
rect
o
ry inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von
Z
w
eigbergk
gitk: Fix "Externa
l
dif
f
" wi
t
h separate
w
o
rk tre
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigb
e
rgk
gitk: Fix "bla
m
e parent
c
ommit
"
with separate
w
ork
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zweigbergk
gitk
:
Fix "
s
how
o
rigin
of this line
"
with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
g
i
tk: Fi
x
fi
l
e highlight when run
in subdirec
t
ory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin
v
on Zwe
i
gbergk
rebas
e
:
c
la
r
i
f
y
"
restor
e
t
h
e original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zweigbergk
Documentation: use [verse] for SYNOPSIS sect
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
a
rtin von Zweigbergk
dif
f
core-rena
m
e: don'
t
consider
u
nmerg
e
d path as s
o
u
r
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
a
rti
n
von Zweigbergk
rebase: define options in OP
T
IONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
artin von Z
w
e
igber
g
k
Makefile: do not install sourced re
b
ase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweig
b
ergk
merge
t
ool: don
'
t skip mo
d
ify/
r
emove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Zweigbergk
rerere
"rema
i
ning"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: use @{u
p
stre
a
m}
if no upstream specifi
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zw
e
igbergk
reba
s
e -i: remove
u
nn
e
cessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: don't
r
ead unused variab
l
e preserve_
m
erges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zweigbergk
git-rebase--am:
r
emove
un
n
ece
s
sary -
-
3way
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on
Z
wei
g
bergk
rebase -m
:
do
n
't prin
t
e
x
it code 2
when
m
e
rge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigb
e
rgk
r
ebase
-
m: remember allow_rerere_
a
u
t
o
u
pdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigbergk
rebas
e
: r
e
member strat
e
gy and s
t
r
a
tegy
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebas
e
:
remember verbo
s
e
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweigbergk
rebase
:
extract cod
e
fo
r
w
r
iting
b
asic s
t
ate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweig
b
ergk
rebase: factor
o
ut s
u
b command ha
n
dling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rg
k
rebase: mak
e
-v a t
i
n
y
bit more verbose
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: align v
a
riable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
rebase: sh
o
w consistent conflict res
o
lution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zw
e
igberg
k
rebase
:
extract am c
o
de t
o
new so
u
rce f
i
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
rebase: e
x
t
ract me
r
ge co
d
e
to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: r
e
move $
b
ranch a
s
synonym f
o
r $orig
_
head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
i
gbergk
re
b
ase:
f
actor out
r
eferenc
e
parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigbergk
rebase -i: suppor
t
--stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwe
i
gberg
k
rebase: reorder v
a
lidation
s
teps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
weigbergk
rebase: facto
r
o
ut
call to pre-r
e
base hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
r
e
b
as
e
-i: rem
o
ve now unnecessa
r
y directory c
h
ecks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
ergk
r
e
bas
e
: fa
c
tor o
u
t clean w
o
rk tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Zwe
i
g
b
ergk
rebase:
factor ou
t
command
line o
p
tio
n
p
ro
c
ess
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigberg
k
rebas
e
: align variable conten
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zwe
i
gbergk
reba
s
e: align
va
r
iable
n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigbergk
reb
a
se: st
r
icter check of st
a
ndalone sub comman
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: act on comma
n
d lin
e
outsi
d
e parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
von Zweig
b
e
rgk
rebase: im
p
rove detection of rebase
in p
r
ogress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
e
i
g
ber
g
k
reba
s
e: remove unused rebase st
a
t
e
'prev_he
a
d
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
r
e
base: read state outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
r
e
f
actor
r
eading
of
st
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwei
g
bergk
reb
a
se: clearer names
for directory variable
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mar
t
in von Zweigbergk
c
o
mpletion: add missing configu
r
ation var
i
a
b
l
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
U
s
e reflog in 'p
u
l
l
--rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
i
n
von Zw
e
igberg
k
rebase: only show st
a
t
if con
f
i
gured to t
r
ue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Ma
r
tin von Zweigbergk
reba
s
e
--abo
r
t
:
do not update branch r
e
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigbergk
rebase
:
support
-
-verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Ma
r
tin von Zweigbergk
Document
a
ti
o
n
/
git-pull
:
clarify config
u
ration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
re
b
ase -X: do not c
l
obber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree