repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
MALLOC_CHECK: enable it, unless disabled explicitly
2012-08-30
M
artin von Z
w
eigbergk
cherry
-
p
ick/revert: respect orde
r
of revisi
o
ns to
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin vo
n
Zweigb
e
rgk
demon
s
trate
b
roken
'gi
t
che
r
r
y-pick
three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
artin vo
n
Zweigbergk
teach log
-
-no-wa
l
k=uns
o
r
t
ed, wh
i
ch avoids sor
t
ing
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
M
a
r
tin v
o
n
Z
w
e
ig
b
ergk
add tests for
'
git
r
ebase
-
-keep-
e
m
pty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
artin von Zweigbergk
cherry: remove r
e
dundant check for merge c
o
mmi
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigberg
k
cherry:
d
o
n
't
s
et ignored rev_info option
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zweigbergk
r
emove
u
nnec
e
ssary p
a
r
a
meter from get_patc
h
_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Zw
e
igbergk
add te
s
t
case
f
or rebase
o
f empty
c
o
mmi
t
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbe
r
gk
am: don't
c
all mailin
f
o if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
in
von
Zweigbergk
am --rebas
i
ng:
g
et pa
t
ch body f
r
om commit, no
t
from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase --ro
o
t
: print usage on
t
oo many args
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
o
n Zwe
i
gbergk
re
b
a
se: don
'
t so
u
rce git-sh-setup twic
e
commit
|
commitdiff
|
tree
2011-12-12
M
a
r
t
in von Zweigbergk
t3401: use t
e
st_commi
t
in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Marti
n
von Zweigb
e
rgk
t3401: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zweigbergk
am
:
don't persist k
e
e
p
c
r
flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
arti
n
von Zw
e
igbergk
remote: only update rem
o
te
-
t
racking branc
h
i
f updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in vo
n
Z
w
eigbergk
r
emote rena
m
e
:
warn when
r
ef
s
pec was
n
ot u
p
dated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zwei
g
berg
k
r
em
o
te: "rename
o f
o
o" should
not
re
n
ame re
f
"o
r
igin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote
:
wri
t
e correc
t
fetch
s
pec
when re
n
am
i
ng remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Sh
o
w modi
f
i
e
d fi
l
es with separate
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
tin vo
n
Zweigbergk
gitk:
S
implify ca
l
cula
t
i
on
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Z
w
eigbergk
g
itk: Run '
g
it
rev-p
a
r
s
e --git-di
r
' onl
y
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Zweigbe
r
gk
g
itk: Put temporary
directory
i
nside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Fix "
E
x
t
ernal diff" with sep
a
rate
w
ork t
r
ee
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigber
g
k
gitk: Fix "blame parent commit
"
with
s
eparate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on
Z
weigb
e
rgk
g
i
t
k
: Fix "show origin
o
f this line" with se
p
a
r
ate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Z
weigbergk
gi
t
k: Fi
x
fil
e
highlight
w
h
e
n run in
s
u
bdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbergk
r
e
b
a
s
e: clarify "restor
e
the
original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin vo
n
Zweigbergk
Docum
e
ntat
i
on:
use
[ve
r
se]
f
or SYNOP
S
IS se
c
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigbergk
diffcore-rename
:
do
n
't consider unmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Marti
n
von
Z
weigberg
k
rebase
:
define options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweigbergk
Makefile: do not
install sour
c
e
d
rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zw
e
igbergk
merget
o
ol: don't
skip m
o
dify/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mar
t
in
von
Z
weigbe
r
g
k
re
r
ere "remainin
g
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von Zweigbergk
rebase: use @{upstream} if
n
o upstrea
m
s
p
ecifi
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igberg
k
re
b
ase -i
:
remove unnecessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zweigbergk
re
b
a
s
e -i: d
o
n
'
t read unu
s
e
d
variable
p
rese
r
ve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
eigbergk
g
i
t
-
r
e
base--am: remove
unnecess
a
ry
--3way
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zwe
i
gbergk
r
e
b
ase -
m
: d
o
n't print exit code 2 when merge
f
ails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase -
m
: remember allow
_
r
e
rer
e
_autoupdate
o
p
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase: remember strategy and str
a
teg
y
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbe
r
gk
rebase:
r
emem
b
er verb
o
se op
t
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract code for writing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
von Zweigbergk
reb
a
se: facto
r
o
u
t
sub command handl
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: make -v
a tiny bit
more verbo
s
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigb
e
rgk
r
ebase -i:
align variable
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zweig
b
ergk
rebase: show
c
onsistent conflict resoluti
o
n
h
int
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
w
e
igber
g
k
rebase: ext
r
act am
c
ode to ne
w
source fi
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
r
e
base: e
x
t
r
act
merge co
d
e to new
sourc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigb
e
rgk
r
e
b
a
se: remove
$br
a
nch as synonym
f
o
r
$orig_
h
e
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out
reference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
gbergk
rebase -i: s
u
pport --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
ergk
rebase: reorder valid
a
tion step
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
e
r
g
k
rebase: facto
r
o
u
t call to
p
re
-
re
b
as
e
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zweigberg
k
rebase -i: rem
o
v
e
no
w
unnecessa
r
y directory
chec
k
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zweigbergk
rebase:
f
actor
o
ut cle
a
n work tree
c
hec
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zwei
g
bergk
rebase:
f
a
c
tor out com
m
a
nd line
o
p
t
ion processi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Z
w
ei
g
be
r
gk
reb
a
se
:
align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: align v
a
ria
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
eigbergk
rebase: stricter check of standalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eig
b
ergk
reba
s
e: act o
n
c
o
mmand line o
u
ts
i
de
parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zweigbergk
reba
s
e: impr
o
ve detection
of rebase in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igbergk
reba
s
e: remove unused rebase
st
a
te 'prev
_
head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: read state
outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
refactor read
i
ng of stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigbergk
rebase: clea
r
er
names
f
or
di
r
ectory variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin
von
Z
weig
b
ergk
com
p
let
i
on: a
d
d
m
issin
g
co
n
fi
g
ur
a
t
i
on variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in
v
o
n Zw
e
igbergk
Use reflog
i
n 'pull --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mart
i
n von Zweigbergk
rebase: only
s
how stat if co
n
figured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Marti
n
v
on Zwe
i
gberg
k
re
b
ase --abort: do
n
ot
u
pdate branch
re
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweig
b
ergk
rebase: support --
v
e
r
ify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Marti
n
von
Zweig
b
ergk
Documentati
o
n/git-pull: clarify co
n
fi
g
u
r
at
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
rebas
e
-X
:
do not clobbe
r
strat
e
gy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree