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
Kiril
l
S
me
l
k
ov
fetch-
p
ack
:
t
e
st expl
i
cit
l
y t
h
at --all can fetch tag
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@nexedi.com>
commit
|
commitdiff
|
tree
2016-09-15
K
i
rill Smelkov
t/
p
e
rf/run:
c
opy config
.
m
a
k
.
a
uto
g
en &
fri
e
nds to
b
uild
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@nexedi.com>
commit
|
commitdiff
|
tree
2016-09-12
Kir
i
ll
S
melk
o
v
pack
-
obje
c
t
s
: use
r
each
a
bility bitm
a
p in
d
ex when gen
e
rating
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@nexedi.com>
commit
|
commitdiff
|
tree
2016-09-12
K
irill
Smel
k
o
v
pack-objects: respect
-
-
local/--hono
r
-pac
k
-k
e
ep/--incr
e
menta
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@nexedi.com>
commit
|
commitdiff
|
tree
2014-04-09
Kirill Smelkov
mingw: ac
t
i
v
ate alloca
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-04-07
Kirill Smelkov
combine-di
f
f: speed it up,
b
y
u
sing multipare
n
t
d
iff
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-04-07
Kiril
l
Smelkov
t
ree
-
diff: rewor
k
diff_tr
e
e
(
) to generate
d
iffs for
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-27
K
i
rill Smelkov
Portable alloca
for Git
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-27
Kiri
l
l Smelko
v
t
r
e
e-diff: r
e
u
se
base str(buf
)
memory o
n
sub-tree recursio
n
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-27
K
irill Smelko
v
tree-diff: no
need to call
"
f
u
ll" diff_tree_sha1 from
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-27
Kirill Smelko
v
tree-diff: rework diff_tr
e
e interface to
b
e s
h
a1
b
ase
d
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-26
Ki
r
ill Sm
e
lk
o
v
tree-diff: d
i
f
f
_tree()
should now be stat
i
c
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-26
Ki
r
i
l
l Smelkov
tre
e
-dif
f
: remo
v
e
special-case di
f
f
-emitting co
d
e
f
o
r
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill Smelko
v
tree-diff: simplify tree_entry_pathc
m
p
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
K
iri
l
l Smelkov
tree
-
diff: show_path prot
o
type is not
neede
d
a
n
y
more
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
K
i
rill
S
m
e
l
ko
v
tre
e
-diff: rename
c
ompare_tree_ent
r
y -> tree_entry_pathcmp
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill
Smelkov
tree
-
di
f
f
: move al
l
acti
o
n-tak
i
ng cod
e
out of c
o
mpare_tre
e
_
e
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Kirill Sme
l
k
o
v
tree-diff: don't
a
ssume comp
a
r
e_
t
ree_entry()
r
e
t
urns
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-20
Ki
r
ill Smelkov
tree-diff: consolidate code for emitting diffs and
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-03-04
Kirill Smelkov
tree-
d
iff: sh
o
w_tree()
i
s
n
ot needed
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill Smelkov
tree-diff:
n
o need to pass match
t
o skip_un
i
nt
e
resting
(
)
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill
Sme
l
kov
t
ree-diff: no need to man
u
ally verify
t
hat there is
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill Smelkov
combi
n
e-diff: move changed-paths sca
n
ning logic in
t
o
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
K
irill Sm
e
lkov
combine-diff
:
move show_log_fir
s
t log
i
c/action out
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill
Smelkov
t
e
st
s
: a
d
d c
h
ecking t
h
at comb
i
ne-dif
f
emits only correct
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill
S
melkov
combine-diff: combine_diff
_
path
.
l
en
is no
t
needed
a
nymore
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kiri
l
l S
m
elko
v
c
ombin
e
-diff:
o
pt
i
miz
e
com
b
ine_
d
iff
_
path sets i
n
tersection
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kir
i
ll Smelkov
dif
f
t
es
t
: add
t
ests for combine-diff with orderfile
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kirill Smel
k
ov
diffcore-order:
e
xport g
e
ne
r
i
c ord
e
ring interf
a
ce
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-24
Kir
i
l
l Smelkov
tree-walk:
f
inally
s
w
i
tch ove
r
t
r
e
e descriptors
t
o
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-05
Kirill Smelkov
r
e
v
i
sion: convert to using diff_tree_
s
ha1()
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-05
K
i
rill Smelkov
line-log: c
o
nver
t
to using diff
_
tree_sha1(
)
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-05
Kirill Smelkov
tree-diff: c
o
nvert diff_root_tree_sha1()
t
o just call
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2014-02-05
Kiri
l
l Smelkov
tre
e
-diff
:
a
l
low diff_tree_sha1 to
a
c
cept NU
L
L sha1
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2013-03-09
Kirill Smelkov
fo
r
mat-patch:
RFC 2047 says multi-octet
c
haracter ma
y
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2013-03-05
Ki
r
ill Smelkov
F
i
x `m
a
ke
ins
t
all`
w
hen c
o
nfigured with autoc
o
nf
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2012-11-13
Kirill Smelkov
g
i
t-gui: Fix parsing
of <rev> <pa
t
h-which-not-
p
r
esent
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2012-01-22
K
irill Smelkov
t/Makef
i
le: U
s
e $(sort
.
.
.
) explicitly
wher
e
need
e
d
Signed-off-by:
Kirill Smelkov
<kirr@navytux.spb.ru>
commit
|
commitdiff
|
tree
2010-12-20
Ki
r
ill
S
melkov
fill_textc
o
nv(): Don
'
t get/put cache if sha1
is
n
ot
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-12-20
K
i
rill Smel
k
ov
t/t8006
:
Demonstrate bl
a
me is broken when
cach
e
textconv
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-11-13
Kirill Smelkov
setup:
m
ake
s
ur
e
git_dir path is in a perma
n
ent bu
f
fer
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2010-09-29
Ki
r
ill Smelkov
bl
a
me,
c
at-file --textconv: Don't
assume m
o
de i
s
``S_IFREF
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-09-29
Kirill Smel
k
ov
blame,cat
-
fi
l
e
: De
m
onst
r
a
t
e --
t
e
xtconv
is wr
o
n
g
ly run
n
ing
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-09-29
Kirill
Smelkov
blame,cat-file: Prepare
--te
x
t
c
onv
test
s
for
c
orrectly
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2010-09-29
Kirill S
m
e
l
kov
user-manual: be consist
e
nt
in illustrations to 'git
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2010-05-30
Ki
r
ill Sme
l
kov
g
i
t
k: Show notes
by default (like g
i
t log do
e
s)
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2010-01-12
Kirill Sme
l
k
ov
g
i
tk:
D
isplay s
u
bmodule diffs w
i
th appropriate enc
o
ding
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2009-08-15
Kirill S
m
e
l
kov
git add -p: demonstrate failu
r
e whe
n
staging bo
t
h mode
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2009-02-01
Kirill Smelkov
mailin
f
o: cleanup extra spaces for compl
e
x 'From:'
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2009-01-29
Kirill Sm
e
lkov
m
a
ilinfo: tests
for
RFC2047 exam
p
les
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2009-01-28
K
i
rill
Smelkov
mai
l
info: add explicit test f
o
r mails lik
e
'<a
.
u
.
thor
.
.
.
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2009-01-12
Kiri
l
l Smelkov
m
a
ilinf
o
: 'From:' heade
r
should be unfold as well
Signed-off-by:
Kirill Smelkov
<kirr@landau.phys.spbu.ru>
commit
|
commitdiff
|
tree
2009-01-11
K
i
r
i
ll Smelkov
mailinfo: co
r
rectly handle multil
i
ne 'Subject:
'
h
eader
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
Teach "git
diff -p" P
y
thon funcname patterns
Signed-off-by:
Kirill Smelkov
<kirr@mns.spb.ru>
commit
|
commitdiff
|
tree