repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase -i: Add tests for "--edit-todo"
2012-09-18
Marti
n
von Z
w
e
i
g
bergk
rebase usage: subcommands
can
not be com
b
ined with
-i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
artin von Zweigber
g
k
che
r
ry-pic
k
/rev
e
r
t
: respect order o
f
revisions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
demons
t
rate broken 'git cherry-pic
k
three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n
von Zweigbergk
teac
h
l
og --n
o
-walk=u
n
sorted,
w
hich avo
i
ds so
r
t
ing
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Marti
n
v
on
Z
weigb
e
rgk
ad
d
tests
for '
g
it rebase --
k
eep-emp
t
y'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von
Zweigbergk
cherry: remove
r
edu
n
d
a
nt
c
heck for merge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Marti
n
von Zweigb
e
r
gk
cherry: don't set ignored rev_info o
p
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin v
o
n
Zweigb
e
rgk
r
emove unne
c
essary parameter f
r
om get_patch_
i
d
s()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Zweigbergk
add
t
est case for reb
a
se of empty commit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigber
g
k
am:
d
on
'
t call mailinfo if
$rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Z
w
eigbergk
am --
r
ebasing: ge
t
patch body from commit, no
t
from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigb
e
rgk
r
e
base --
r
oot: print
u
sage on too many args
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase
:
don't source git-s
h
-setup tw
i
ce
commit
|
commitdiff
|
tree
2011-12-12
Martin vo
n
Z
w
e
i
gbergk
t3401
:
use test_com
m
it in setu
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbergk
t3401: moder
n
ize sty
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Ma
r
tin von Zweigbergk
am: don
'
t persist keepcr
f
l
ag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
weig
b
ergk
remote
:
o
n
ly update r
e
mote-trackin
g
b
r
a
n
ch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mart
i
n
v
on Z
w
eig
b
e
r
gk
remo
t
e rena
m
e: w
a
r
n
when
r
efs
p
e
c
was n
o
t upd
a
ted
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
r
t
in v
o
n Zweigbergk
remot
e
: "rename o foo" should no
t
r
e
name ref "orig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
weigbergk
r
e
mote:
write correct fetch s
p
ec
w
h
en
renamin
g
remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigbergk
g
i
tk: Show modified f
i
les
w
ith separate
work tr
e
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigber
g
k
gitk: S
i
mplif
y
c
a
lc
u
lation
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Zweigberg
k
gitk: Ru
n
'g
i
t rev-parse
--git-dir' only onc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gitk
:
Pu
t
tempora
r
y
d
i
r
ectory in
s
ide
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin
von Zwe
i
gbe
r
g
k
gitk: Fix "External diff"
w
i
th
se
p
a
r
at
e
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gi
t
k
: Fix "b
l
a
m
e paren
t
commit" with s
e
parate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zwei
g
b
erg
k
gitk: Fix "show origi
n
o
f
this line" wi
t
h separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zw
e
igbergk
gitk: Fix file h
i
ghli
g
ht when run i
n
sub
d
irectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
M
a
rtin von Zweigbe
r
gk
rebas
e
: clarify "restor
e
the original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Mar
t
i
n
von Zwei
g
berg
k
D
ocumenta
t
ion: use [verse] f
o
r SYNOPSIS sec
t
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
ar
t
in von Zwei
g
bergk
diffcore-rena
m
e
:
don't cons
i
d
er unmerged
path a
s
source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin
v
on Z
w
e
i
gbergk
reb
a
se: define
options in OPTIONS_
S
PEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
art
i
n
v
on Z
w
eig
b
ergk
M
a
k
e
file:
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 Zweigbergk
merge
t
o
ol:
d
o
n
't
ski
p
modify/r
e
move con
f
l
icts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Marti
n
v
o
n Zweigbergk
r
erer
e
"remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
reba
s
e
: use @{upstrea
m
} if no upstr
e
am sp
e
c
i
fied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigbe
r
gk
rebase -i
:
remov
e
unn
e
cessary stat
e
rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von Zweigber
g
k
re
b
ase -i: do
n
't read un
u
s
e
d
va
r
iable pr
e
s
erve
_
merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igb
e
rgk
git-r
e
base
-
-am: rem
o
ve u
n
nec
e
s
sary --
3
w
a
y option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweig
b
e
r
g
k
rebase -m: don't prin
t
exit c
o
de 2 when merge fa
i
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase -
m
: remember allow_
r
erere_
a
utou
p
da
t
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
re
b
ase: remember strategy and
strat
e
gy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n
v
on
Zwei
g
bergk
r
e
bas
e
:
r
ememb
e
r ve
r
bose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Zweigbergk
reb
a
se: extrac
t
co
d
e for writing b
a
sic stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zwei
g
berg
k
reba
s
e
:
fact
o
r
o
u
t sub
c
ommand
h
andlin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: make -v a
t
iny bit more verb
o
se
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Z
w
e
igbergk
r
eb
a
se -i:
align variabl
e
n
ame
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zwe
i
g
b
e
r
gk
r
ebase: sho
w
consist
e
nt conflict resolut
i
o
n hin
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebas
e
: ex
t
ract am code t
o
n
e
w source
fi
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigbergk
r
e
base: extract me
r
g
e code t
o
new
sour
c
e file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase: remov
e
$branch as syn
o
nym for $orig_h
e
ad
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin v
o
n
Zweigbergk
rebase
:
factor out reference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
ei
g
bergk
reba
s
e
-
i: supp
o
rt --
s
tat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweig
b
ergk
r
e
base: reorder vali
d
atio
n
s
teps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base:
f
actor out call to
p
re-re
b
ase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
reb
a
se -i: remov
e
n
ow unnecess
a
ry directory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigberg
k
rebase: factor o
u
t clean
w
ork
tr
e
e
c
he
c
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
o
n
Z
weigbergk
rebase:
factor o
u
t comman
d
line
o
p
tion processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase
:
al
i
gn
v
ariable
c
o
ntent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zweigbergk
r
e
b
ase: ali
g
n variable na
m
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase
:
stricter ch
e
ck
of stan
d
alone
sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigber
g
k
rebase: ac
t
o
n co
m
mand line ou
t
side
p
arsing lo
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zwei
g
bergk
re
b
ase:
i
mprove detection o
f
reb
a
se in
progre
s
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
reb
a
se: remove unused rebase state
'
prev_h
e
ad'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von Zwe
i
gber
g
k
rebase: read sta
t
e
outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase
:
refactor readi
n
g
o
f
s
tate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: clearer
names for directory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin v
o
n Z
w
eigber
g
k
completion:
add missing co
n
figuration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
U
s
e reflo
g
in '
p
ull --reba
s
e
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
rtin
v
o
n Z
w
eigbe
r
gk
r
e
b
ase: only show stat if configured
t
o
true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin
von Zweigbe
r
gk
rebas
e
--abort: do not update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Ma
r
tin v
o
n Zweigbe
r
g
k
r
ebase: support
-
-verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Mar
t
in
von Zweig
b
ergk
D
ocumentation/git-p
u
ll:
c
larify co
n
figuratio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
a
r
tin von Zwei
g
bergk
rebase
-X: do not clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree