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
Git 1.7.7-rc3
2011-08-18
J
u
nio C
Hamano
Mer
g
e branch 'js
/
sh-style
'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C
H
a
m
ano
Mer
g
e branch
'
js/ref-namespac
e
s'
commit
|
commitdiff
|
tree
2011-08-18
Jun
i
o C Hamano
Merge
b
ranch 'cb/
m
a
i
n
t
-quiet-push
'
commit
|
commitdiff
|
tree
2011-08-18
Junio C Hamano
Mer
g
e
br
a
nc
h
'jc/maint-combine
d
-
d
iff-work-tree'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C
Hama
n
o
Merge br
a
nch 'cb/m
a
int-exec-error-report
'
commit
|
commitdiff
|
tree
2011-08-18
Junio
C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-08-18
Ju
n
io C Hama
n
o
Merge b
r
anch 'rc/hist
o
gram-diff
'
into HEAD
commit
|
commitdiff
|
tree
2011-08-18
Tay Ray Chuan
x
d
iff/xprepare: improve O(n*m)
p
erf
o
rm
a
nce in x
d
l_cleanup_r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-17
Dmitry Ivan
k
ov
d
o
c
/fast-
i
mpor
t
: docu
m
ent
feature import-marks
-
if-
e
x
ists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-17
Nguyễn
T
hái Ngọ
c
D
u
y
checkou
t
-i
n
dex:
r
emove obsolete comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Syn
c
wi
t
h
"mai
n
t"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ham
a
no
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-08-16
Jonathan Nieder
merge-recursive: take advantage
of
ha
r
dcoded empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C
H
amano
Prepare for 1
.
7
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch '
j
k/tag-lis
t
-mu
l
tip
l
e
-p
a
tterns' into ma
i
nt
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch 'jl/submodule-update-quiet' i
n
to maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
ni
o
C Hamano
M
erge branch
'
j
l/submod
u
le-add-re
l
url-w
o
-upstream'
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Ju
n
io C
Hamano
Me
r
ge branch 'oa/
p
ull
-
reflog' into maint
commit
|
commitdiff
|
tree
2011-08-16
J
uni
o
C Hamano
Merge branch
'
js/l
s
-
t
ree
-
error' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Me
r
ge branch 'jk
/
fa
s
t-export-quote-
p
a
th'
into m
a
i
nt
commit
|
commitdiff
|
tree
2011-08-16
Junio C Haman
o
Merge br
a
nch 'jc/
c
heckout-refl
o
g-fix'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ha
m
an
o
Me
r
ge b
r
anch 'jc/
m
aint
-
reset-unme
r
ged-path' into main
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge branch 'mz/doc-r
e
b
a
se-abo
r
t' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge
b
ra
n
ch 'bw/log-all-ref-updates-doc' into
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
Merge
branch 'js/maint-add-path-stat-pwd' into ma
i
nt
commit
|
commitdiff
|
tree
2011-08-16
Junio C Haman
o
M
erg
e
branch 'ms/help-unknown' into maint
commit
|
commitdiff
|
tree
2011-08-16
Junio C H
a
mano
Merge bra
n
ch 'mz/doc
-
synopsis-verse'
into
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio
C
Hamano
Merge b
r
a
n
c
h
'jn/mime-type-with-
p
ar
a
ms'
into
m
aint
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
M
e
rg
e
br
a
nch 'jc/submodule-s
y
n
c-no-
a
uto-vivify
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Juni
o
C Hamano
Merg
e
branch 'jc/zl
i
b-wr
a
p' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-08-16
Junio C Ham
a
no
Me
r
ge br
a
nch 'fk/relink
-
upon-l
d
flags-updat
e
'
into maint
commit
|
commitdiff
|
tree
2011-08-16
J
u
nio C Hama
n
o
Merge branch 'bc/
s
ubmodule-f
o
reach-stdin-fix-1
.
7
.
4
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
J
unio C Hama
n
o
M
e
r
ge branch 'aw
/
rebase-i-p' into
maint
commit
|
commitdiff
|
tree
2011-08-16
Junio
C Hamano
Merge branch 'jc/diff-index-
q
u
ick-exit-ea
r
l
y
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-08-16
Junio C Hamano
M
e
rge branch
'
jk/c
o
mbi
n
e-diff-binary-
e
tc' into maint
commit
|
commitdiff
|
tree
2011-08-16
Jeff King
a
m
: refresh the index at sta
r
t a
n
d --resolve
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-16
Jo
n
at
h
a
n
Niede
r
rev
e
rt: plug memory le
a
k
in "c
h
erry-pick root
c
ommit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
i
chael
Haggerty
Unroll th
e
loop ov
e
r passes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
ic
h
ael Hagger
t
y
Chang
e
w
h
ile loop i
n
to f
o
r loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michae
l
Ha
g
gerty
Determine the sta
r
t of
the states outside o
f
t
he pass
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Hag
g
e
rty
C
hange par
s
e_a
t
tr
(
) to take a point
e
r
to st
r
uct attr_state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Michael Haggert
y
Incr
e
ment num_attr in
parse_attr_line(),
n
ot
parse_at
t
r()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Mich
a
e
l
Ha
g
gerty
Document str
u
ct mat
c
h_attr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
M
i
c
hael H
a
ggerty
Add a f
i
l
e
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Dmitry Iva
n
kov
fas
t
-impo
r
t: pr
e
ven
t
producin
g
bad delta
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Dmitry Ivankov
fast-i
m
port
:
add
a
test for tree delta base corruption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive:
D
o
n'
t
re-sort a
l
ist whos
e
order
w
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newre
n
merge-recursive:
Fi
x
virtual me
r
ge base for rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
36: criss-cros
s
+ rename/rename(1t
o
2)/a
d
d-dest
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge
-
recursive
:
A
v
oid unnecess
a
ry file rewrites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6
0
22: Addit
i
onal tes
t
s
c
h
e
cking
f
or un
n
ecessary updates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Fi
x
spurious 'refusing to lose u
n
tracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6022: Ad
d
t
estc
a
se for
s
purious "refusi
n
g to lose
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Jeff King
t3030: fix accidental suc
c
ess 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
E
l
ijah Newren
merge-recur
s
i
v
e:
F
ix working copy han
d
ling for r
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
g
e
-
r
ecursive: a
d
d h
a
nd
l
in
g
for rename/r
e
name/a
d
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
merg
e
-
recursive:
Have conflict_rename_delet
e
reuse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
merge-recur
s
ive:
Make mo
d
if
y
/del
e
t
e
handling code
r
eusable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-
r
ecursive: Consider modifications
i
n ren
a
me/
r
en
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-
r
ecursive: Create
fu
n
ction for merging
with
bran
c
h
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recursive: Record more
data need
e
d for m
e
rgin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-r
e
cursive: D
e
fer
rename/renam
e
(2to1) hand
l
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
me
r
ge-r
e
c
u
rsiv
e
:
S
m
a
l
l cleanups for conflict_rename_rename_1to2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
Fix re
n
am
e
/rename(1to
2
) resolution
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
In
t
roduce a me
r
ge_fil
e
co
n
venien
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge
-
recursive: Fix modi
f
y/delete re
s
olu
t
ion
in
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
N
e
wren
me
r
ge-recu
r
sive: Whe
n
we detect we can skip an
u
p
da
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursive: Provide more
i
n
f
o in conflic
t
markers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-r
e
cur
s
ive:
C
leanup a
n
d co
n
solidation
of rename_conflic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: C
o
nsolidate p
r
ocess_en
t
ry() and process_df_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
me
r
g
e
-recursiv
e
: Improv
e
ha
n
dl
i
ng o
f
r
e
na
m
e target
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-rec
u
rsive: Add com
m
ents
about han
d
li
n
g rena
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
merge-recu
r
sive: Mak
e
dea
d
code
f
or r
e
name/rename(2t
o
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e
-
r
ecursive:
F
i
x delet
i
on
of untra
c
ke
d
file
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: 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
Elija
h
N
e
wren
me
r
ge-re
c
ursive
:
Al
l
o
w
make_
r
oom_for_path(
)
to
r
emov
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Johan
n
es Sixt
string-list: Add API to
remove an
item from an unsorted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recur
s
ive: S
p
li
t
was_tra
c
ked() out of
w
ould
_
lose_untra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
r
g
e
-recursive: Save D/F confl
i
ct f
i
l
e
names instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
c
u
rsive: Fi
x
code checkin
g
for
D/F
c
on
f
lic
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
mer
g
e
-recursive: Fix s
o
rting order and 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
Elijah N
e
wr
e
n
merge-r
e
cursi
v
e: Fix
r
ecursive c
a
s
e
with D/F
confli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Avoid
wo
r
k
ing directory c
h
ang
e
s during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merg
e
-re
c
ur
s
ive: Remem
b
er to
f
ree g
e
nerated unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursive
:
Conso
l
idate different
up
d
ate_stages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
New
r
en
merge-
r
ec
u
rsive: Mark so
m
e diff_filespec struct arg
u
ments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
ewren
merge-recursiv
e
:
Co
r
r
e
ct
a
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rsive: Make BUG me
s
s
a
g
e
mor
e
legible b
y
adding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6022: Add
testcas
e
for merging
a
renamed file with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wren
t602
2
:
N
ew
t
ests ch
e
c
king
for unnecessary upd
a
tes
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
ren
t6
0
22: Remove unne
c
essary untrack
e
d
f
iles to make
t
est
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
36: criss-
c
ros
s
+ rename/re
n
ame(1
t
o2)/
a
dd-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6036:
criss-cross w/
r
e
n
ame/renam
e
(1to2)/mo
d
ify+rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
t
6
03
6
:
t
ests fo
r
criss-cross merges with
various direct
o
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6036
:
criss-cross w
i
th weird content can fool
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
t6036: Add diffe
r
ently resolve
d
modify
/
delete
c
onfli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
4
2: Add failing testc
a
s
e
s for
r
ename/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042: Ensure
rename/rename conflicts leave inde
x
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6042: Add
te
s
ts
f
or
c
ontent is
s
ues with modify/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t
6042: Add a testcase where undetected re
n
ame causes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next