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
Merge branch 'fk/use-kwset-pickaxe-grep-f'
2011-08-18
J
e
ff
Ki
n
g
t
est-lib: add helper
functions for
config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
t
7
006: modern
i
ze ca
l
ls to unset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Ngu
y
ễn Thái Ngọc Duy
fetch-p
a
c
k: chec
k
for valid commit from serve
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Thá
i
N
gọc Duy
log: decora
t
e graf
t
ed 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_commits to fetch-pack
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Thái Ngọc Duy
Add
for_
e
ach_c
o
mmit_g
r
aft() to iterate a
l
l grafts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
N
g
u
yễ
n
T
hái N
g
ọc Duy
deco
r
a
t
i
on: do not mis-
d
ecorate refs with same
p
refix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Update draft
r
elease notes to 1
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o
C Hamano
Merge branch
'
mh
/
check-attr-relative'
commit
|
commitdiff
|
tree
2011-08-18
J
u
nio C Hamano
Merge branch 'js/bis
e
ct-no-checkout'
commit
|
commitdiff
|
tree
2011-08-18
J
u
nio C Ham
a
no
Merge branch
'
rc/histogram-diff'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C
Hamano
Merge
b
ranch 'jc/maint-sma
r
t-ht
t
p-race-uplo
a
d-p
a
c
k'
commit
|
commitdiff
|
tree
2011-08-18
J
u
nio C
H
amano
Mer
g
e
branch 'js/
s
h-
s
tyle'
commit
|
commitdiff
|
tree
2011-08-18
Juni
o
C H
a
man
o
M
er
g
e
branch 'js/ref-na
m
es
p
a
c
es'
commit
|
commitdiff
|
tree
2011-08-18
J
u
n
i
o C Hamano
Merge branch 'cb/maint-quiet-push'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Ha
m
ano
Merge
b
ranch 'j
c
/maint-combined-diff-work-
t
r
ee'
commit
|
commitdiff
|
tree
2011-08-18
Junio C
Hamano
Merge branch 'c
b
/
m
a
i
n
t-exec-error-rep
o
rt'
commit
|
commitdiff
|
tree
2011-08-18
Junio C H
a
mano
Merge
branch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2011-08-17
Dmitry Ivankov
doc/fast-im
p
o
r
t: d
o
cument feature impo
r
t-marks-if-e
x
ists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-17
Nguyễn Thá
i
Ngọc D
u
y
check
o
u
t
-index: remove obsolete c
o
mment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio C
H
amano
Sync wit
h
"maint"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-08-16
Jonathan Nieder
merge-recursiv
e
: take adv
a
n
tage of hardcoded empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C Hama
n
o
Pr
e
pare for 1
.
7
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hama
n
o
Merge branch
'
jk/ta
g
-list-multiple-patt
e
r
ns' int
o
maint
commit
|
commitdiff
|
tree
2011-08-16
J
unio C Hamano
M
erge branch
'j
l
/su
b
m
odule-upda
t
e
-q
u
i
e
t' into main
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
M
e
rge bra
n
ch 'jl/su
b
module-a
d
d-r
e
lurl-wo-upstream'
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C
H
amano
Me
r
g
e
b
r
a
n
ch 'oa/pull-r
e
flog' into
m
a
int
commit
|
commitdiff
|
tree
2011-08-16
Junio C
Haman
o
Merge
branch 'js/ls-tr
e
e-err
o
r' i
n
to maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge
b
ranch 'jk/fast-ex
p
ort-quote-path' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio
C Hamano
M
e
rge branch 'j
c
/ch
e
ckou
t
-
re
f
log-fix' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ham
a
no
Merge branc
h
'
j
c/
m
aint-
r
eset-unm
e
rged-pa
t
h' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Haman
o
Merge
b
ranch 'mz/doc-rebase-abort'
into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch 'bw/
l
og-a
l
l-ref-upd
a
tes-doc' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch 'js/maint
-
add-path-stat
-
pwd' in
t
o maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
M
e
r
g
e branch 'ms/hel
p
-
u
n
k
n
own' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C
H
amano
Me
r
ge br
a
n
c
h 'mz
/
doc-synopsis-verse' into
m
aint
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io
C
Hamano
Merge b
r
anch 'jn/mime-type-wi
t
h-pa
r
ams' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
M
e
rge branc
h
'jc/su
b
mo
d
ule-sync
-
no-auto-
v
ivify' into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C
H
a
m
a
n
o
Merge br
a
nc
h
'j
c
/zlib-wrap
'
into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio
C
Hamano
Merge
bran
c
h
'fk/reli
n
k-upon-ldflags-update'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ha
m
a
n
o
Mer
g
e
bra
n
c
h
'bc/submo
d
ule-f
o
rea
c
h-stdin-fix-1
.
7
.
4
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ha
m
ano
Merge
b
r
anch 'aw/
r
e
base-i-p' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C
Ham
a
no
Merge branch 'jc/diff-index-quick-ex
i
t-early'
into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C Hamano
Mer
g
e branch 'j
k
/combine-diff-b
i
nary-etc' into maint
commit
|
commitdiff
|
tree
2011-08-16
J
eff King
am: refres
h
t
h
e
i
ndex at sta
r
t
and
--resol
v
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Jon
a
t
h
an Nieder
revert: p
l
ug memory leak in "ch
e
rry-pick root
commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
ichael Hag
g
e
r
ty
Unroll the loop
o
ver passes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Ha
g
gerty
Chan
g
e
while loop
into for l
o
op
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Ha
g
g
erty
Dete
r
mi
n
e the start
o
f th
e
states outsid
e
o
f
the pass
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Hagge
r
ty
Change pa
r
se_att
r
() to take
a
p
oin
t
er
t
o
stru
c
t attr_s
t
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
i
chael Hagger
t
y
In
c
rement num_attr in parse_attr_
l
ine(), not
p
arse_attr
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Mic
h
a
el
Hag
g
ert
y
D
o
c
u
ment
s
truc
t
match_attr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
i
chael Haggerty
Add a file
c
omme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Dmi
t
r
y
I
v
ankov
fast-import
:
p
reven
t
producing bad delta
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Dmi
t
ry Iva
n
kov
fast-impo
r
t: add a test for
t
r
ee
delta
base corruption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newre
n
merg
e
-recu
r
siv
e
: Don't re-sort a
l
i
s
t w
h
ose order we
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: Fix virtual
m
erge ba
s
e
for re
n
ame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newre
n
t6036: c
r
iss-cross +
r
ename/renam
e
(1
t
o2
)
/add
-
dest
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merg
e
-recursive: Avoid unne
c
es
s
ary file
rew
r
ites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022
:
A
d
d
i
tion
a
l
test
s
ch
e
cking for unnece
s
sar
y
upd
a
tes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
re
n
merge-r
e
curs
i
ve: Fix
spur
i
ous
'refusing to lose unt
r
acked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6022
:
A
dd testcase
f
or spurio
u
s "refusing to lose
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Jeff King
t3030: fix
accidental success
in sy
m
link rename
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
me
r
ge-
r
ec
u
rsive: F
i
x
working copy
h
andling fo
r
rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Newren
merge-recu
r
s
i
ve: add
handling for ren
a
m
e
/re
n
ame
/
add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
merge-
r
e
cursi
v
e
:
Have confl
i
ct_rename_delete reuse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recu
r
sive: Make modify/delete handling code reusab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursi
v
e: Consider
modifications in
r
enam
e
/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Newren
m
e
r
ge-
r
ecursive
:
Create function for merging with b
r
anchname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recu
r
sive: Record m
o
r
e
da
t
a ne
e
d
e
d
f
or merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rsi
v
e: Defer rename/rename(2to1
)
handling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah New
r
e
n
me
r
ge-recursive: Smal
l
c
leanups for conflict_rena
m
e
_
rename_1
t
o2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
wr
e
n
m
e
rge-recurs
i
v
e
:
Fix re
n
ame/rena
m
e
(
1to2) resolution
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: In
t
roduce
a
merge_file
c
onvenience
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: F
i
x modify
/
delete r
e
solution in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive
:
Whe
n
we detect we
can skip an update
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursiv
e
: Provide more info in
confli
c
t markers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Cleanup a
n
d cons
o
lida
t
ion of rename_conflic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-re
c
u
r
sive
:
C
o
nso
l
i
d
at
e
proc
e
ss_entry() and pr
o
cess_df_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
ren
merge-re
c
ur
s
ive: Improve handling of rename target
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive: Add com
m
en
t
s about handl
i
ng rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Ma
k
e dead
code
for
r
ename/re
n
a
me(
2
to1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah N
e
wren
m
e
r
g
e
-
re
c
ursive: Fix
deletion of u
n
tracked file i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-re
c
ursive: Split update_stage
s
_a
n
d_entry; only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: Allow make_room_fo
r
_p
a
th
(
) to rem
o
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Johannes Sixt
s
tring-list: Add API to remove
a
n
item from
an
u
nsorted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newren
merge-r
e
cursive: Split was_track
e
d()
o
ut of wo
u
ld_lose_
u
nt
r
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursi
v
e: Save D/
F
conf
l
ict
f
ilenam
e
s instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Fix code checking for D/F c
o
nflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive:
F
ix sorting or
d
er
a
nd directory change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recu
r
si
v
e
: Fix
r
ecursive case
w
it
h
D/F conf
l
ict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
erge-recursiv
e
: Avoid working directory changes during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
a
h Ne
w
ren
merg
e
-recurs
i
ve: Remember to free ge
n
erate
d
unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursive: Cons
o
lidate
different
update_st
a
ges
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-
recur
s
ive
:
Mark
s
ome diff_filespe
c
st
r
uct
arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-
r
ec
u
rsive: Correct
a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: Make B
U
G
m
essage more legible by adding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newr
e
n
t6022: Add testcase
f
o
r
merging a renamed file w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
r
e
n
t6022: New t
e
sts checking for unnecessary upd
a
tes o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next