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
rerere: add note about files with existing conflict markers
2018-06-13
K
i
rill
S
melkov
fe
t
ch-pack: test
explicitly t
h
at
-
-al
l
can fetch ta
g
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@nexedi.com>
commit
|
commitdiff
|
tree
2016-09-15
Kirill Smel
k
ov
t
/
p
e
rf/run:
c
opy config
.
mak
.
a
u
t
o
gen & friends to
b
u
i
l
d
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@nexedi.com>
commit
|
commitdiff
|
tree
2016-09-12
Kirill Smelkov
p
ack-ob
j
ects: use re
a
ch
a
bility bitmap index whe
n
g
eneratin
g
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@nexedi.com>
commit
|
commitdiff
|
tree
2016-09-12
Kiril
l
Smelkov
pac
k
-
objects: r
e
spe
c
t
--
l
o
c
al/--honor-pack-keep
/
-
-i
n
c
r
ementa
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@nexedi.com>
commit
|
commitdiff
|
tree
2014-04-09
Kirill Smelk
o
v
m
ing
w
: activate alloca
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-04-07
Kirill Smelk
o
v
combine-diff: speed
i
t up, by
using mu
l
tiparent diff
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-04-07
Kirill Smelkov
tree-diff: rework diff_tre
e
() to ge
n
erate diffs fo
r
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-27
Kirill Smelko
v
Portab
l
e
alloca
f
or Git
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-27
K
iril
l
Sm
e
l
kov
tr
e
e
-
d
i
ff: reuse base s
t
r(buf) memory on sub
-
tree
r
ecursio
n
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-27
Kirill Smelkov
tre
e
-diff: no n
e
ed
t
o
call "full" diff_tre
e
_sha1 f
r
o
m
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-27
Kiri
l
l Smelkov
t
r
ee-d
i
ff:
r
ework dif
f
_tree interface to
b
e
s
h
a1
based
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-26
Ki
r
ill Smelko
v
tree-diff: diff_tr
e
e() shou
l
d now b
e
s
tatic
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-26
Kirill Sm
e
lkov
tree-di
f
f: remove sp
e
c
i
al-case diff-
e
mitti
n
g c
o
d
e
for
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill Smelkov
tree-diff: simplify tree_entry_pathcmp
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill Sm
e
lkov
tree-diff: show_path prototype is not ne
e
ded anym
o
re
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill Smelkov
tree-
d
iff
:
rename compare_tree_entry -> t
r
e
e
_entry
_
pat
h
c
m
p
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill Smelkov
tree-diff: mo
v
e
all action-tak
i
ng code out o
f
compar
e
_tree_
e
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill Smelkov
tree-diff: don't assume
c
ompare_tr
e
e_entry()
ret
u
rn
s
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill S
m
e
l
ko
v
tree-
d
iff: consolidate
code
for em
i
tting dif
f
s a
n
d
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-04
Kirill Sm
e
lkov
tree-di
f
f: show_
t
re
e
() is not needed
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
K
i
rill Smelkov
tree-diff
:
no need to
p
ass ma
t
c
h to
s
kip_
u
ni
n
t
e
resting
(
)
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill S
m
e
lko
v
tree-diff: no need to m
a
nually v
e
rify that t
h
ere is
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
K
irill Smelkov
co
m
b
i
ne-diff: move changed
-
pa
t
hs scanning lo
g
ic into
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Ki
r
ill Smelkov
combin
e
-
diff
:
mo
v
e
show_log_first logic/a
c
tion
out
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill Smelkov
tes
t
s
:
add chec
k
ing
t
hat combi
n
e
-
d
i
ff emits only correc
t
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill Sm
e
lkov
c
o
mbine-
d
i
ff: combin
e
_d
i
ff_path
.
l
en is not n
e
eded an
y
more
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
K
iri
l
l
S
melkov
combine-diff:
optimize combin
e
_diff_pat
h
s
ets intersection
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill Smelkov
diff
t
est: ad
d
tests for combine-
d
i
f
f with orderfi
l
e
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kir
i
ll
Smelkov
diffcore
-
order: export generi
c
o
rdering in
t
e
r
face
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill Smelkov
tree-walk: f
i
nally switc
h
over tree descriptor
s
to
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-05
Kiri
l
l Smelkov
revisio
n
: con
v
ert t
o
using diff_tr
e
e
_
s
h
a1()
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-05
Kirill Smelko
v
l
i
ne-log: convert to
u
sing diff_tr
e
e_s
h
a1()
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-05
Kirill Smelkov
tree-diff:
convert diff_root_tree_sha1() to just call
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-05
Kirill Smelkov
tree-
d
if
f
: al
l
ow di
f
f_tree_
s
ha1
t
o accept NULL sha1
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2013-03-09
Kirill Smelk
o
v
fo
r
mat-patch: RFC 2047 says
m
ulti-oc
t
et char
a
cter may
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2013-03-05
Kir
i
ll Smelk
o
v
Fix `make install` wh
e
n configured with auto
c
on
f
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2012-11-13
K
i
rill Sme
l
ko
v
git-gui: Fix parsi
n
g
o
f
<rev> <path-wh
i
c
h-not-present
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2012-01-22
Kiril
l
Smelkov
t/Makefil
e
:
U
se $(s
o
rt
.
.
.
) explicitly wher
e
needed
Signed-off-by:
Kirill Smelkov
<kirr@navytux.spb.ru>
commit
|
commitdiff
|
tree
2010-12-20
Kirill
Smelkov
f
i
ll_te
x
t
co
n
v
(
)
:
D
o
n't get/p
u
t cache if sha1
i
s not
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-12-20
Kirill
Smelkov
t/
t
8
0
0
6:
D
e
monstrate
blame is broken when cachetext
c
o
nv
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-11-13
Kirill Smelkov
setup: make
sure git_
d
ir
path is i
n
a
p
e
r
manent bu
f
fer
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2010-09-29
Kirill Smelkov
blame,cat-fil
e
--textconv: Don't assume mo
d
e is
``S_IFREF
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-09-29
K
i
rill Smelkov
b
lame,ca
t
-
file:
Demo
n
s
trate --textco
n
v is wrongly ru
n
nin
g
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-09-29
Kirill Smelkov
blame
,
c
at-file: Prepar
e
--te
x
tconv tests fo
r
correc
t
ly
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-09-29
K
irill S
m
elkov
user-manual: be c
o
nsi
s
t
e
n
t in
illustrations to 'git
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2010-05-30
Kirill Smelkov
gitk:
S
ho
w
notes by def
a
u
l
t (like git log do
e
s)
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2010-01-12
Kiri
l
l Smelkov
gitk: Display submodule di
f
fs with appropriate encoding
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2009-08-15
Kirill S
m
elkov
git ad
d
-p: demonst
r
ate failu
r
e w
h
en staging b
o
th mode
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2009-02-01
Kirill
S
melkov
mailinfo:
cleanup
ex
t
ra
spaces
for c
o
mplex 'From:'
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2009-01-29
Kirill Sm
e
l
kov
mailinfo: tes
t
s for RF
C
2047 e
x
amples
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2009-01-28
Ki
r
ill Sme
l
ko
v
mailinf
o
: ad
d
ex
p
lic
i
t tes
t
for m
a
ils like
'<a
.
u
.
thor
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2009-01-12
K
i
r
i
ll Sm
e
l
k
ov
maili
n
fo: 'From:' header should b
e
unfol
d
as
w
ell
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2009-01-11
Kiri
l
l
Sm
e
l
k
ov
m
a
i
linfo: c
o
rrectl
y
han
d
l
e multi
l
ine 'Subject:' header
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2008-08-21
Kirill
Smelko
v
Teach "git d
i
ff
-
p
"
Pyth
o
n funcn
a
me
patte
r
ns
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree