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
t7004: extract generic "GPG testing" bits
2011-08-18
Nguy
ễ
n
Thái Ngọc D
u
y
l
o
g: decorat
e
g
raft
e
d commits with "gr
a
fted"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Thái Ngọc
D
u
y
Move write
_
shallow_co
m
mits
t
o fetch-pack
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Thái Ngọc Du
y
Add for_each_c
o
mmit_graft() to iterate
a
ll
g
rafts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
N
guyễn Thái
Ngọc Duy
decorati
o
n: do not mis-de
c
orate
r
e
fs with same prefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Junio C Ham
a
no
U
pd
a
t
e dra
f
t release notes t
o
1
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Ju
n
i
o C H
a
mano
Merg
e
bran
c
h 'mh
/
c
h
eck-attr-relative'
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o C H
a
mano
Merge
branch 'js/bisect-no-
c
h
e
ckout'
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o
C
Hamano
Merge b
r
anch 'rc/histogra
m
-diff'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
M
erge b
r
an
c
h 'jc/maint-smart-http-race-up
l
oad-pack
'
commit
|
commitdiff
|
tree
2011-08-18
J
u
ni
o
C Ham
a
no
M
e
rge br
a
nch
'js/s
h
-style'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Ha
m
ano
Merge bran
c
h 'js/ref-
n
amespaces'
commit
|
commitdiff
|
tree
2011-08-18
Junio C
Hamano
Merge branch 'c
b
/
m
aint-quiet-pu
s
h'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Merge branch 'jc/main
t
-com
b
in
e
d-dif
f
-
w
ork-tr
e
e'
commit
|
commitdiff
|
tree
2011-08-18
Junio C H
a
mano
M
erge
b
ra
n
ch 'cb
/
maint-exe
c
-
error-report'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-08-18
J
u
nio C Hamano
Me
r
ge
b
ranch '
r
c/
h
istogra
m
-diff' into HEAD
commit
|
commitdiff
|
tree
2011-08-18
Tay Ray Chuan
xdiff/
x
prepar
e
:
improve
O
(n
*
m) perfo
r
m
a
n
ce in
xdl_cleanup_re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-17
Dmitry Iv
a
nkov
do
c
/
fast-import: document feature import-marks-if-exi
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-17
Nguyễn Thái Ngọc D
u
y
c
h
e
c
kou
t
-
i
ndex: remove obsolete comm
e
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C Hama
n
o
Sync with "ma
i
nt"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
M
erge branch
'
m
aint'
commit
|
commitdiff
|
tree
2011-08-16
Jonatha
n
Nieder
merge-recursive: take advantage of hardcoded empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio
C
Hamano
Pr
e
par
e
for
1
.
7
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Juni
o
C Hamano
Merge
branch 'jk/ta
g
-li
s
t-multi
p
l
e
-patterns' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ham
a
no
M
erge branch 'jl/s
u
bmodule-update-quiet'
into
m
aint
commit
|
commitdiff
|
tree
2011-08-16
J
unio C
H
a
mano
Me
r
ge b
r
anch
'jl/sub
m
odule-add-relu
r
l
-
wo-upstrea
m
'
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
J
un
i
o C Hamano
Merge b
r
anch 'oa/
p
u
ll-reflog' into maint
commit
|
commitdiff
|
tree
2011-08-16
Juni
o
C Hama
n
o
Merge branch 'js
/
ls-tree-error' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ha
m
ano
Merge branch
'jk/fast-export-quote-path' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C
H
amano
Merge bran
c
h
'jc/chec
k
out-re
f
log-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-08-16
Junio C
Hama
n
o
Merge bran
c
h 'jc/maint-reset
-
unm
e
rged-
p
ath
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ha
m
an
o
Merge br
a
nch 'mz/
d
oc-rebase-abort' into maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
n
io C Hamano
M
erge branch
'
b
w/
l
og-all
-
ref-up
d
at
e
s-doc
'
into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge
b
ranch 'js/ma
i
n
t
-add-path-s
t
at-pwd' in
t
o main
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C H
a
mano
M
erge bran
c
h
'ms/help-unkno
w
n' into maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
n
io C
H
a
mano
M
erge branch 'mz
/
doc-s
y
n
o
p
s
is-ver
s
e' into
m
aint
commit
|
commitdiff
|
tree
2011-08-16
Junio
C
H
a
mano
Merge bra
n
ch 'jn/
m
ime-type-
w
ith-
p
arams' int
o
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
M
e
rge
b
ran
c
h
'
jc/submodule-s
y
nc-no-au
t
o-v
i
vify' into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C
H
a
mano
Merge branch 'jc/zlib
-
wr
a
p
'
into maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C
Hamano
Merge br
a
nch 'fk/reli
n
k-upon-ldflags-update' into maint
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C
H
a
mano
Merge branch 'bc/submodule-foreach-s
t
di
n
-fix-1
.
7
.
4
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merg
e
b
r
anc
h
'aw/rebase-i-
p
' into m
a
int
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
i
o
C Hamano
Merge branch '
j
c/di
f
f-index-quick-ex
i
t-early' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch
'
jk/combine
-
di
f
f-bi
n
ar
y
-e
t
c'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-08-16
Jeff King
am: re
f
resh the index at
s
t
a
r
t and --resolved
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Jonathan Nied
e
r
revert: plug memory l
e
ak i
n
"cher
r
y-pick r
o
ot commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael H
a
g
g
erty
Unrol
l
the loop over passes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Haggerty
Cha
n
ge whi
l
e
loo
p
into for l
o
op
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Hag
g
erty
Determi
n
e
the
start of
t
he sta
t
es
o
utsid
e
of th
e
p
ass
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Ha
g
gerty
Change p
a
rse_attr() to take a pointer to
s
tru
c
t attr
_
state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
ich
a
e
l
Haggert
y
I
n
crem
e
nt
n
um_attr in parse
_
at
t
r_line
(
), not
parse_attr()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Mi
c
hael
H
a
gge
r
ty
Document st
r
uc
t
mat
c
h_at
t
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
ichael Hag
g
erty
Add a file
commen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
D
m
itry
Ivankov
fast-import: prevent pro
d
ucing ba
d
de
l
ta
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Dmitry Ivankov
fa
s
t-i
m
port: ad
d
a t
e
st for tree delta base corruption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
ren
merge
-
recursive: Don'
t
re-sort a li
s
t who
s
e order we
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-recursive: Fix virt
u
al me
r
g
e base for rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6036: criss-c
r
o
s
s + ren
a
me/rename
(
1to2)/add-dest
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
g
e
-recursive: Avoid un
n
ecessary fil
e
rewrit
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6022: Addition
a
l tests checking for unnecess
a
ry updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
wren
merge-recursive: Fix spuri
o
us 'ref
u
sin
g
t
o lose untracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6022:
A
dd testca
s
e
f
o
r spurious "refusing to lose
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Je
f
f K
i
ng
t30
3
0
: fix accidental
s
uccess in
symlink r
e
name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
re
n
m
e
rg
e
-recursiv
e
: Fix wor
k
i
n
g copy handling fo
r
rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merg
e
-rec
u
rsive: add handling for rename/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-re
c
ursive: Have confl
i
c
t
_rename_
d
elete r
e
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
erge-recursive: Make
m
odify/delet
e
handling code reusable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive:
C
onsider modifications in
renam
e
/rena
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
merge-
r
ecursive: Cr
e
ate fun
c
tion for merging wi
t
h
branchname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Record m
o
re
d
ata needed for mer
g
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newren
mer
g
e-recursive: Def
e
r
r
e
name/rename(2to1) handling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-re
c
ursive: Small cleanup
s
for con
f
lict
_
rena
m
e
_rename_1to2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
rge-recursive: Fix rename/ren
a
me(1to
2
) resoluti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
mer
g
e-
r
ecursive: Introduce a merge_file c
o
nvenience
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
merge-
r
ecursive
:
Fix m
o
d
i
fy/delete
r
esolution in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursive
:
When we detec
t
w
e
can ski
p
an
u
pd
a
te
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge
-
recu
r
s
ive:
Provide more info in con
f
lict
m
a
rkers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-rec
u
rsi
v
e: Clean
u
p
and consol
i
dation of r
e
name_conflic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-r
e
c
u
rsive: Consolida
t
e process_
e
ntry() and proce
s
s_df_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewre
n
merge-re
c
ursive: Improve ha
n
dling of ren
a
me target
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursive: Add comm
e
nts about hand
l
ing
rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
mer
g
e
-
r
e
cursive: Make de
a
d code
f
o
r rename/rename(2to1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
m
erge
-
re
c
u
r
sive: Fix
d
e
le
t
ion of untracked file in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
r
e
n
merge-recursi
v
e: Split up
d
at
e
_stag
e
s_and_entry; only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newren
m
e
r
ge-recur
s
i
ve:
Allo
w
make_room_for_pa
t
h()
t
o
r
emov
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Johann
e
s S
i
xt
s
tring
-
list: Add API to remove an item
from an uns
o
rted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
merge-recursive: Split wa
s
_tracked() ou
t
of would_l
o
s
e_untra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recurs
i
ve
:
S
a
ve D/F conflict filena
m
es
i
n
stead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recu
r
sive: Fix code checki
n
g for D/F conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
e
rge-recur
s
iv
e
: Fix sorting
or
d
er
a
nd
d
irectory chan
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
e
rge-r
e
cu
r
sive:
F
ix recursive case with D/
F
confli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recur
s
ive: Avoid
working d
i
rectory changes d
u
r
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recursive: Remember to
f
ree ge
n
erated unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recurs
i
v
e: Consolidate different
u
pdate_
s
tages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-
r
ecursive:
M
ark
s
ome diff
_
file
s
pec struct arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge
-
r
ecursive: Co
r
re
c
t a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newr
e
n
merge-recursive: Mak
e
BUG message more legible by
a
d
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
t
6
022:
A
dd te
s
t
c
as
e
for m
e
rging a ren
a
m
ed f
i
le with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newr
e
n
t6022:
New tests checking
fo
r
unnec
e
ssary updates of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
t6022
:
Remov
e
unn
e
ces
s
ary untracke
d
files to m
a
ke test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next