repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
2011-08-14
Elijah
N
ewren
me
r
ge-recursi
v
e: Fix
virtual merge base fo
r
re
n
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newren
t6036
:
criss-c
r
o
ss
+ rena
m
e/rename(1t
o
2)/add-dest
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursive: Avoid un
n
ecessa
r
y
f
ile rewrites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Additional tests checkin
g
for
u
nnecessary
u
p
dates
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive: Fix spurious
'refusi
n
g to lose unt
r
acked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022:
Add testcase for spurious "r
e
fu
s
ing to
l
ose
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
J
e
ff King
t303
0
: fix accident
a
l success in s
y
mlink 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
El
i
j
a
h
Ne
w
r
e
n
merge-r
e
c
ursive:
F
ix working cop
y
h
and
l
ing
f
or rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive: add handlin
g
f
or r
e
n
ame/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-rec
u
rsive: Have con
f
lict_rename_delete
r
euse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-recursive: Make modify/del
e
te h
a
n
dling cod
e
reusable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
e
rge-recursive: Consi
d
er modifica
t
ion
s
in r
e
name/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
ewren
merge-recursive: Create f
u
n
cti
o
n
for merging wit
h
br
a
nchname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-
r
ecursive: R
e
cord more data
needed for me
r
g
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recu
r
sive: Defer rename/rename(2to1) hand
l
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
e
w
ren
me
r
g
e
-re
c
ursiv
e
: Small cleanu
p
s for con
f
l
ict_rename_re
n
ame_
1
to2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-rec
u
rsive: Fix rename/rename(
1
to2)
res
o
lution
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recursive: Introduce
a merge_file
c
onvenience
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursiv
e
: Fix mod
i
fy/delete resolution in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursi
v
e:
W
hen w
e
detect
w
e
c
an skip an update
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
mer
g
e-recursive
:
Pro
v
ide mo
r
e info in conflict marke
r
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
r
e
n
merg
e
-re
c
ursive: Cle
a
nup
a
n
d consolidation of rename_
c
o
nfli
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
m
e
rge-rec
u
r
s
ive: C
o
nsolidate
p
rocess_entry() and process
_
df_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-r
e
cur
s
ive: Improve handling of rename target
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-
r
ecursi
v
e: Add comments about handling
r
ename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge
-
recursive: Make dea
d
code for rena
m
e/rename(2to
1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wr
e
n
merg
e
-r
e
cursive:
F
ix deletion o
f
untracked file
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
siv
e
: Split upda
t
e_stages_and_entry; only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-rec
u
rsiv
e
:
A
llow
make_room_f
o
r_
p
ath() to
rem
o
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
J
ohannes S
i
xt
string-list
:
Add
A
P
I
to remove an
item from an
u
ns
o
r
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
merge-
r
ecursi
v
e: S
p
l
it was_tracked() ou
t
of would_
l
ose_untra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
mer
g
e-recursive:
S
ave D/F
c
onfl
i
ct fil
e
names
i
nstead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix
cod
e
checkin
g
for D/F
c
o
nflict
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
m
erg
e
-
recursive: F
i
x
so
r
ti
n
g ord
e
r and directo
r
y
c
h
ange
.
.
.
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-recursive: Fix r
e
curs
i
ve case with D/F conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recurs
i
ve: Avoid working di
r
ector
y
c
h
anges d
u
ri
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
ren
merge-r
e
cursiv
e
: Remember t
o
free generate
d
un
i
q
u
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah Newren
merge
-
recursive: Consolidate
d
iffer
e
nt update_st
a
ges
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
ren
merge-recursi
v
e: Mark s
o
me di
f
f_fil
e
sp
e
c struct argu
m
ents
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursi
v
e: Corr
e
ct a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
N
e
w
ren
merge-recu
r
sive: Make
BUG message more legible b
y
adding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6
0
22: Add testcase for merging a renamed fil
e
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6022: New tests checking for unnecessary upd
a
tes of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
w
r
e
n
t602
2
: Remove unnecessary untrack
e
d files to make t
e
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
36: criss-
c
ross + r
e
n
a
me/
r
e
n
am
e
(1to2)/add-sourc
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cross
w/ r
e
n
a
me/
r
e
n
ame(1to
2
)/modify+rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t603
6
:
t
est
s
f
or criss-
c
ros
s
merges with
v
ario
u
s dir
e
ctory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-c
r
o
s
s with weird content can fool
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
3
6
:
Add differently
res
o
lved
m
odify/delete conf
l
ict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6042
:
Add failing
t
estcases
f
or rename/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042: Ensure rename/renam
e
conflicts leave index and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newr
e
n
t6
0
42: Add tests for content issues
with modify/
r
ename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6042
:
A
dd a tes
t
case wher
e
undetected re
n
a
me causes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h New
r
en
t6042: Add a pair
o
f
cases where undetected renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newr
e
n
t
6042
:
A
d
d
f
ail
i
ng testcase f
o
r re
n
am
e
/m
o
dify/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042:
A
dd
a
t
estcase where g
i
t deletes an u
n
tracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim
M
eyering
fet
c
h: do not leak a refspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio
C Hamano
Git 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
J
unio
C
Hamano
M
e
rge branch 'jk/
m
ain
t
-config-alias-fix' into mai
n
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hama
n
o
Merge
b
ranc
h
'j
c
/fmt-req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Merge
b
ranch 'jk/maint-d
o
c
s
' into maint
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
i
o
C
H
a
m
ano
Mer
g
e branch 'jn
/
do
c
-r
e
m
ote-helpers' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Merge b
r
anch 'kk/m
a
int-pr
e
f
i
x-
i
n-config-mak' int
o
main
t
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyeri
n
g
diffcore-rename
.
c: avoid
set-
b
ut-not-used wa
r
ning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Ha
m
ano
Start 1
.
7
.
5
.
4 dr
a
f
t
release no
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C Hamano
M
e
rge branch 'tr/add-i-no-es
c
ape'
i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
amano
Mer
g
e branch '
v
h/con
f
ig-intera
c
ti
v
e-singlekey-
d
o
c'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merg
e
bran
c
h
'
m
l/te
s
t-
r
eadme' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Hamano
Merge br
a
n
c
h
'ab
/
i18n-f
i
xup
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Haman
o
Merge bra
n
ch 'jc/rename-d
e
gr
a
de-cc-
t
o
-c' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Hamano
Mer
g
e bra
n
ch 'rr
/
doc-co
n
tent-type' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-30
Jona
t
han Nie
d
er
Document
a
tion: do
no
t
misinterpret refsp
e
cs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
i
o C Hamano
Merge
b
ranch '
j
m/main
t
-misc
-
fi
x
' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merg
e
b
ranc
h
'b
c
/m
a
in
t
-submodule-
f
ix-parked' int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C Hamano
Merge branc
h
'
bc/maint-a
p
i-doc-pa
r
ked'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
e
rge branch
'
jn/run-command
-
error
-
fa
i
lure' into main
t
commit
|
commitdiff
|
tree
2011-05-27
Jun
i
o C Hamano
co
n
fig
.
m
a
k
.
i
n:
a
llow "configu
r
e --
s
ysconfdir=/
e
l
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: fix
s
ome antique example out
p
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff King
docs
:
ma
k
e
s
u
r
e literal
"->
"
isn't converted to arro
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
d
o
c
s
: upda
t
e status
--
p
or
c
elai
n
f
ormat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
King
docs: minor
grammar fi
x
e
s
t
o g
i
t-st
a
tus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
rando
n
Casey
g
it-submodule
.
s
h
: s
e
parate
p
a
re
n
s by a space to av
o
id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Bran
d
on Cas
e
y
D
ocum
e
ntation/technica
l
/api-di
f
f
.
txt: correct
n
ame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_
g
i
tfile_ge
n
tly: use
s
size_t to hold
read
res
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Ji
m
Meyering
remove tests of always
-
false
c
o
n
dit
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m
Meyering
rerere
.
c: diagnose a
c
orrupt MERG
E
_RR when h
i
ttin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Ham
a
no
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
M
e
r
g
e branch 'maint-1
.
7
.
4' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge bran
c
h 'jk/git-connection-dead
l
ock-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch '
j
s
/
maint-
s
end-pack-statele
s
s-
r
pc-
d
eadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
man
o
Mer
g
e branch 'jk/maint-uplo
a
d-pack-shall
o
w
' i
n
t
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C Hamano
Merge branch 'jm
/
mai
n
t-d
i
f
f-words
-
with-sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C H
a
m
a
no
Merge branch 'kk/maint-prefix-in-config
-
mak' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hamano
Merge branch 'mg/diff-
u
ico
n
fig-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge branch 'ft/
g
i
t
web-tar-
w
it
h
-gzip-n
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge branch 'ss/doc-svn' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Me
r
ge branch 'jn/fo
r
mat
-
patch
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Merge
b
ranch 'jc
/
ma
i
nt-pathsp
e
c-stdin-and
-
cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Mer
g
e branc
h
'jk/cherry-pick-root-wit
h
-
resolve' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge
branch
'
rg/c
o
py-gecos-username
'
into
m
a
int
commit
|
commitdiff
|
tree
next