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 'jc/clean-exclude-doc'
2011-08-19
Junio C Hamano
Merg
e
branch 'd
b
/am-
s
kip-blank-
a
t-the-begin
n
ing'
commit
|
commitdiff
|
tree
2011-08-19
Ju
n
io C Hamano
Me
r
g
e
b
ranch 'ma/am-exclude
'
commit
|
commitdiff
|
tree
2011-08-19
Junio C Hamano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-08-18
J
e
ff King
git_c
o
nfig_
c
olorbool: ref
a
cto
r
st
d
out
_
is_tty han
d
ling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
diff: refa
c
tor
C
OLOR
_
D
I
FF from
a
fl
a
g into an
int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
setup_pager: set
G
IT_PAGER_IN_USE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Je
f
f Kin
g
t7
0
06: use test_c
o
nfig hel
p
er
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Jef
f
Ki
n
g
test-lib: add helper functions for config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Jeff King
t7
0
06
:
modernize calls to
unset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
N
g
uyễn T
h
ái Ngọc Duy
fetch-pack: check for valid comm
i
t from server
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Th
á
i N
g
ọc D
u
y
lo
g
: d
e
c
o
rate graft
e
d
commits with "gra
f
ted"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Ngu
y
ễ
n
Thái N
g
ọc Duy
Move
w
r
ite_sha
l
low_commits 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 Duy
Add for_each_
c
ommit_gr
a
f
t
(
)
t
o iterate al
l
grafts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Nguyễn Th
á
i Ngọc
Duy
decoration:
d
o not mis-decorate
r
e
fs
with same
p
refix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Junio C H
a
m
ano
U
p
da
t
e draf
t
release notes to
1
.
7
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Me
r
ge br
a
nch '
m
h/check-a
t
t
r
-
relative
'
commit
|
commitdiff
|
tree
2011-08-18
J
unio C Ha
m
ano
Merge branch
'js/bi
s
ect-n
o
-
c
h
ecko
u
t'
commit
|
commitdiff
|
tree
2011-08-18
J
unio
C
Hamano
Merge branch 'rc/histogram-diff'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C
H
a
m
a
n
o
Merge bran
c
h 'jc/maint-smart-ht
t
p-race-upload-pa
c
k'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Merge branc
h
'js/sh-style'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C Hamano
Merge bran
c
h 'js/ref-namespaces'
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o C
H
amano
M
erge branch 'cb/maint-quiet-p
u
sh'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Mer
g
e br
a
nc
h
'jc/main
t
-
c
o
mbine
d
-di
f
f-work
-
t
ree'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C
H
amano
M
e
rge branch
'
c
b/main
t
-
e
xec-
e
r
ror-repor
t
'
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o C Hamano
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-08-18
J
u
n
io C Hamano
Merge branch 'rc/histogram-diff
'
i
nto
H
EAD
commit
|
commitdiff
|
tree
2011-08-18
T
ay Ray Ch
u
an
xdiff/x
p
repare: impr
o
ve O(n*m)
p
erformance in xdl_cl
e
a
nup_
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-17
Dm
i
t
ry
Iv
a
nkov
doc/fa
s
t-im
p
o
rt: d
o
c
ument
f
ea
t
ure import-marks-i
f
-ex
i
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-17
Ngu
y
ễn Thái Ngọc D
u
y
c
h
eck
o
ut-index: remove obso
l
ete comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ha
m
ano
Sync with
"
m
a
int"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge
b
r
a
nch
'maint'
commit
|
commitdiff
|
tree
2011-08-16
Jona
t
han Ni
e
der
merg
e
-rec
u
rsi
v
e: t
a
ke advant
a
ge of hardcoded
e
mpty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C Hamano
Prepare fo
r
1
.
7
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Jun
i
o C
H
amano
Merge branch 'jk/t
a
g-l
i
st
-
multiple-patterns' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C Hamano
Merge branch 'jl/submodule-update-
q
uiet' into maint
commit
|
commitdiff
|
tree
2011-08-16
Jun
i
o C Hamano
Merge branch 'jl/submodule-ad
d
-relurl-w
o
-
upstream'
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Juni
o
C
Hamano
Mer
g
e branch 'oa/pull-reflog' i
n
to maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge
bran
c
h 'js/ls
-
tree
-
erro
r
' into m
a
int
commit
|
commitdiff
|
tree
2011-08-16
Junio
C
Hamano
Mer
g
e branch 'jk/fast-expo
r
t-
q
uote-path' into m
a
int
commit
|
commitdiff
|
tree
2011-08-16
Junio C H
a
mano
M
e
rge b
r
anch '
j
c/checkout-re
f
log-fix' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C
H
ama
n
o
Merge
br
a
n
c
h 'jc/maint-reset-unmerged-path'
i
nto
maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C Hamano
Merge br
a
nc
h
'mz/doc
-
rebase-abort' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-08-16
J
unio C Hamano
M
erge br
a
n
ch 'b
w
/
l
o
g-al
l
-ref-updates-doc'
into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio
C Hamano
Merge
b
ranch
'
j
s/maint
-
add-p
a
th
-
stat-pwd' into m
a
int
commit
|
commitdiff
|
tree
2011-08-16
J
unio C Hama
n
o
M
erge
b
ranch 'ms/help-u
n
know
n
' i
n
to maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Me
r
ge branch 'mz/d
o
c-synopsis-ver
s
e' into maint
commit
|
commitdiff
|
tree
2011-08-16
J
unio C H
a
ma
n
o
Merge branch 'jn/mi
m
e-ty
p
e-wi
t
h-params' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
M
e
rge
bra
n
ch 'jc/submodul
e
-
syn
c
-no-auto-vivify' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
J
u
ni
o
C
H
am
a
no
Merg
e
b
r
anch 'jc/zlib-wrap
'
into
m
aint
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C Ha
m
an
o
Merge bran
c
h 'fk/re
l
i
nk-upon-ldflags-
u
pdate' into m
a
int
commit
|
commitdiff
|
tree
2011-08-16
J
unio C Hamano
Merge branch 'bc
/
submo
d
ule-foreac
h
-
std
i
n-
f
ix-1
.
7
.
4
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C
H
amano
Merge br
a
nch 'a
w
/reb
a
s
e
-
i
-p' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C
H
amano
M
e
rge branch 'jc/
d
iff-i
n
dex-quick-e
x
it-
e
a
r
ly'
into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio
C Haman
o
Merge b
r
anc
h
'
j
k/combine-diff-binary-etc
'
into maint
commit
|
commitdiff
|
tree
2011-08-16
Jeff King
a
m
: refresh
t
h
e
index at start an
d
--
r
esol
v
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Jonathan
N
ieder
revert: plug
memory leak
i
n "cherry-pick roo
t
commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Haggerty
Un
r
oll
t
he loop ove
r
pa
s
se
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
ichael
H
aggerty
Change w
h
ile l
o
op into for loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Haggerty
D
etermine
t
h
e
st
a
rt of the states outside
o
f the
pas
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael
H
aggerty
Change parse_attr() to
take a pointer t
o
struct attr_state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael H
a
ggerty
I
ncrement num_at
t
r
i
n parse_attr_line(
)
, not parse
_
attr()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Ha
g
gerty
D
o
cum
e
nt st
r
uct ma
t
ch_attr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael
H
aggert
y
Add a
file
c
omm
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Dmitry Ivankov
fast
-
import
:
p
r
event producing
bad delta
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Dmit
r
y
I
v
anko
v
f
ast-import: a
d
d a test for
t
re
e
delt
a
base cor
r
uption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
Don
'
t re-s
o
rt a list wh
o
se ord
e
r we
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newre
n
merge
-
recursive: Fix virtual merg
e
base for rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6036: criss-cross
+ rename/re
n
ame
(
1
t
o2)/add-d
e
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
me
r
ge-recursive: Avoid
u
nnecessar
y
file rewrites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6022: Additional tests check
i
n
g
for
unn
e
cessary updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewre
n
merge-re
c
urs
i
ve: Fix spur
i
ous 'refusing to lose untrack
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t602
2
:
Add te
s
tcase fo
r
spurious "refusing to l
o
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
J
eff
K
ing
t303
0
: f
i
x
acc
i
dental
su
c
cess
i
n sym
l
ink 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
Elijah New
r
en
merge
-
r
e
cursive: Fix working copy
h
andling for
r
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
me
r
ge
-
recursi
v
e: add handling for
r
e
name/
r
ename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
e
wren
merg
e
-r
e
cursi
v
e
: Have conflict
_
rename
_
d
e
lete reu
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
en
mer
g
e-recursive: Make modify/delete handling
c
ode
reusable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-
r
ecursive: Consid
e
r m
o
difications in rena
m
e/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-
r
ecursive:
Create fun
c
tion for merging wi
t
h br
a
n
chname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
r
e
n
merge
-
rec
u
rsive
:
Record
m
ore data
needed
for merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-
r
ecursive:
D
efer rename/re
n
a
m
e(2t
o
1) handling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
S
m
a
ll cle
a
nups for confl
i
ct_rename_rename_1to2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
ursive: Fix ren
a
me/rename(1to2) resoluti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Introduce a merge_file
c
on
v
enience
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursive: Fix modify/delete r
e
s
o
lut
i
on in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursiv
e
: When we detect we can skip an up
d
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
e
rge-
r
ecu
r
sive: Provide more info in conflict markers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
merge-recur
s
ive:
Cl
e
anup and consolidation of rename_confli
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ewren
mer
g
e-recursive: C
o
nsolida
t
e proce
s
s
_entry() a
n
d process_df_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
m
e
rge-recursi
v
e:
Improve handli
n
g
of
renam
e
target
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
ren
m
erge-
r
e
c
urs
i
v
e: Add
comm
e
nts abo
u
t handling rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newren
merge-recurs
i
ve: Make
d
ead code for
rename/re
n
ame(2
t
o1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
merg
e
-recursive: Fix deletion of
u
ntr
a
cke
d
file
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newre
n
m
erg
e
-r
e
cursiv
e
: Split update_
s
tages_an
d
_
entry; on
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursive: Al
l
o
w
m
ake_room_for
_
path() t
o
remo
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
J
o
hannes Sixt
string-list:
Add API to remove an item from an
u
n
s
orted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
merg
e
-recursive: Split was_tracked() out
of w
o
uld_lose_
u
ntr
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
e
cursive: Save D/F
c
o
n
fli
c
t filena
m
es i
n
stead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newre
n
m
er
g
e-recu
r
sive:
Fix
code
c
hecking
f
or D/F conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge
-
r
e
c
ursive: Fi
x
s
o
rti
n
g order a
n
d di
r
ectory
c
hange
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next