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
builtin/notes.c: mark file-scope private symbols as static
2012-08-30
Martin
vo
n
Zweigbe
r
gk
c
herry-pick/rev
e
rt: res
p
ec
t
order
o
f revisions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
demonst
r
ate broken 'git
cherry-pi
c
k three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin vo
n
Zweigber
g
k
teach log -
-
no-walk=unsort
e
d, which avoids
sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin
von
Zw
e
i
g
b
e
rgk
add tests for
'git
r
e
base
-
-keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigb
e
r
g
k
cherry:
r
emove redundan
t
c
h
eck for merg
e
c
o
mmit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigbergk
cherry: don't
s
et ign
o
red rev_i
n
fo options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
M
artin von Zweigbe
r
gk
remove unneces
s
a
ry
p
arameter from get_patch_
i
ds
(
)
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Zw
e
igbergk
add test
c
as
e
for reb
a
se of em
p
ty
commi
t
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n v
o
n Zweigbergk
am: d
o
n
't call mailin
f
o if
$
r
ebas
i
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin
von Zweigbergk
am --rebasing: get patc
h
body from commit, not f
r
om
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n von Zweigbe
r
gk
re
b
ase -
-
r
oot: print u
s
age
o
n to
o
m
any args
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbe
r
g
k
r
e
base: don't so
u
rce git-sh-setup t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigberg
k
t
34
0
1: use test_commit
in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von
Zweigbergk
t3401: moderniz
e
s
t
yle
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zwei
g
bergk
am: d
o
n't persist k
e
epcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Z
w
eigberg
k
r
e
m
o
t
e: only
u
p
date r
e
mote-tr
a
cki
n
g branch if updati
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zwei
g
ber
g
k
remote rena
m
e: warn w
h
en refspec was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
weigbergk
remote: "rename o foo" shou
l
d
not rename re
f
"origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
artin von Zweigbergk
r
e
mote: wr
i
te
correct fetch spec when r
e
naming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Z
w
eigbe
r
gk
g
it
k
: Show mod
i
fied fil
e
s
w
it
h
separate
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Z
w
ei
g
b
e
rgk
gitk: Simplif
y
c
a
l
culation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwe
i
gb
e
rgk
gitk
:
Ru
n
'g
i
t rev-pa
r
se --g
i
t-di
r
' only
o
nce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zwei
g
b
ergk
gitk
:
Put tem
p
or
a
ry directory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igb
e
rgk
gitk
:
Fix "External diff" with sepa
r
ate
work
t
re
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigbergk
gitk: Fix "blam
e
parent commit"
w
i
t
h separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigb
e
rgk
git
k
: Fix "show or
i
gin of this line" with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zweigber
g
k
gitk: Fix file highlight
when run
i
n su
b
d
i
rect
o
r
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
M
a
rtin von Zwei
g
bergk
rebase:
c
larify
"restore the origina
l
b
r
anch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Marti
n
von Zweigbergk
Documentatio
n
:
use [
v
erse] f
o
r SYNO
P
SIS s
e
cti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Marti
n
von Zwei
g
bergk
diffcore-renam
e
:
d
on'
t
consider unmerge
d
path as
sour
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
arti
n
von Zweigbe
r
gk
re
b
as
e
:
d
efine options
in O
P
T
I
ONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
artin von Zweigbergk
Makefile: do not instal
l
s
o
urced
r
ebas
e
scr
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin v
o
n Zweigb
e
rgk
mer
g
etool: don't skip modify/remove c
o
nf
l
icts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigber
g
k
rerere "re
m
aining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zweigbergk
rebase:
u
s
e
@{upstream
}
if
n
o u
p
str
e
am
specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
r
e
b
ase -i: rem
o
ve unnecessary
state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigber
g
k
rebase -i: don't read unused var
i
a
ble
preserve_m
e
rges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigb
e
rg
k
git-rebase
-
-a
m
: remo
v
e un
n
ecessary --3
w
ay option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zw
e
igbergk
rebase -m: don't
p
rint
e
xit co
d
e 2 w
h
en merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
ergk
rebase
-
m: remem
b
e
r
a
llo
w
_rerere_autoupdat
e
option
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
rebase: rememb
e
r strategy and str
a
tegy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase
:
r
em
e
mb
e
r verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
o
n Zweigbergk
r
e
base: extract
c
o
de for writ
i
ng
b
a
sic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweig
b
ergk
rebas
e
: fa
c
t
o
r out sub comman
d
handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase:
ma
k
e
-v
a tiny bi
t
mor
e
verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigb
e
rgk
rebase -i: align vari
a
bl
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: show consistent conf
l
ict r
e
s
o
l
u
t
ion
hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweigber
g
k
rebas
e
: extract am code t
o
new source
file
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
b
ase: extract merge code
t
o new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zweigbergk
r
e
b
ase: remove $branch as synonym for $
o
rig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase:
f
actor
out referenc
e
par
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigb
e
rgk
reba
s
e
-
i: sup
p
ort --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
gbergk
rebase: re
o
r
d
er validation
s
t
eps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
factor out call to pre-
r
ebase ho
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
ei
g
bergk
rebase -i: rem
o
v
e now unnecessa
r
y direct
o
r
y
c
hecks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out clean
w
ork tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von
Zweigbergk
rebase: factor out command line option processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
w
e
i
gbergk
reb
a
se: align variable cont
e
nt
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: alig
n
varia
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weig
b
e
rgk
reba
s
e: stricter ch
e
ck of stand
a
lo
n
e
sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweig
b
ergk
r
e
b
a
se: act
on
comman
d
line outside pars
i
ng loo
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zweig
b
e
rgk
rebase: improve d
e
te
c
t
ion o
f
rebase in pro
g
r
e
ss
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
r
g
k
r
e
base: remo
v
e unused rebase
s
tate 'p
r
ev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Zweigbergk
r
ebase: read state outside
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
r
e
b
ase: refa
c
tor readi
n
g
of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase:
c
lea
r
e
r
names for director
y
var
i
ables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Ma
r
ti
n
von
Z
w
e
i
g
b
ergk
completion: a
d
d m
i
ssing configura
t
ion
varia
b
les
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
rti
n
vo
n
Zweigbe
r
gk
Use reflog in
'
p
u
l
l
--rebas
e
.
f
o
o'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
reb
a
s
e: only show stat
if confi
g
ur
e
d to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigb
e
rgk
reba
s
e --abort:
do not update
branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin vo
n
Zweigb
e
rgk
rebase:
s
uppor
t
--verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
artin
von
Z
w
eigbergk
Documentation/g
i
t-pull:
clar
i
fy config
u
ration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Marti
n
von
Z
weigbergk
rebas
e
-
X
: do not clobber strat
e
gy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree