repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
2011-08-14
Elijah Newr
e
n
t6
0
3
6: criss-cross
+
rena
m
e/rename(1t
o
2)/add-dest
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
merge-recursive: A
v
oid unnec
e
ssary file
r
ewrites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022:
Additional t
e
sts checking fo
r
unnecessary upd
a
tes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wr
e
n
merge-recu
r
si
v
e:
F
ix
s
p
u
r
ious 'refusing to lose untra
c
ked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6022
:
Add testcase for spurious "refusing to lose
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Jeff King
t3030: fix
accid
e
ntal success in symlink re
n
a
m
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
El
i
jah N
e
wr
e
n
merge-re
c
ursive: F
i
x w
o
rking copy h
a
ndling for rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recurs
i
v
e: add handling
for renam
e
/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h New
r
en
merge-recursive: H
a
ve
c
onflict
_
rename_de
l
ete reuse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
m
e
rge-rec
u
rsive: Make modify/delete handling co
d
e reusable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
e
rg
e
-recursive: Consider modi
f
ications in ren
a
m
e
/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
mer
g
e-recursive: Create function
f
or mergi
n
g wit
h
branchn
a
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-
r
ecursive:
Record more dat
a
n
ee
d
ed for merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recur
s
ive: Defer rename/
r
ename(2to1) handling
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wr
e
n
merg
e
-recursive: Smal
l
cle
a
n
ups
f
or con
f
lict_rename_rename_1to2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge
-
r
e
cursive: Fix rename/
r
e
n
ame(1to2)
r
esolution
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
e
rge-recur
s
ive: Intr
o
duce a
merge_file conv
e
nience
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: Fix
modify/delete resolution in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursive
:
When
w
e detect we can skip an update
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
me
r
ge-recursiv
e
:
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
merge-recursive:
C
leanu
p
an
d
conso
l
idation of rename_c
o
nflic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recursi
v
e:
C
o
n
s
o
lidate proces
s
_ent
r
y() a
n
d
process_df
_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newren
merge
-
recursive: Improve han
d
ling of rename target
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newre
n
merge-recursive:
Ad
d
comments about
h
andling
r
e
n
ame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge
-
r
ecursive:
M
ake dead
c
ode for rename/rename(
2
to1
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-re
c
ur
s
ive: Fix deletion of
u
nt
r
acked fil
e
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive:
S
plit update
_
stages_and_ent
r
y; only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
wren
merge-
r
ecursive: Allo
w
make_room_for_pa
t
h() to
r
e
move
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
J
o
hannes Six
t
st
r
ing
-
list:
A
d
d
API to
r
e
mov
e
a
n
i
te
m
f
r
om a
n
unso
r
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
me
r
ge-r
e
cursive
:
Split was_tra
c
ked(
)
out o
f
w
o
uld_lose_untra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-re
c
ur
s
ive:
Sav
e
D/F
c
o
nflict fi
l
en
a
mes
i
nstead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
erge-recursive:
Fix c
o
de
c
hecking for
D
/F conf
l
icts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Ne
w
ren
merge-recursiv
e
: Fix sor
t
i
n
g 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
New
r
e
n
m
erge
-
recursive: Fix recur
s
ive ca
s
e
with D/F con
f
lict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-r
e
cursive: Avoid
w
o
r
king director
y
changes during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah
N
e
wren
me
r
ge-recur
s
iv
e
:
Remember
t
o
free g
e
nerated uni
q
u
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursiv
e
: Consolidate differ
e
nt updat
e
_stages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursiv
e
: Mark some diff_filespec struct
argum
e
nts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge
-
re
c
ursive: Correc
t
a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursive: Make BUG
m
essage more legib
l
e
by add
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6022: Add testcase for merging
a renamed fi
l
e wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t
6
0
22: New tes
t
s ch
e
cki
n
g f
o
r unnecessary updates of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
t6022: Re
m
o
ve
u
nnec
e
ssary un
t
rack
e
d files t
o
make test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah
New
r
en
t6036: criss-cross + renam
e
/rename(1
t
o2)/add-sourc
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
e
wren
t6036: cr
i
ss-cross
w/
rename/rena
m
e(1
t
o2
)
/modify+ren
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
036
:
t
e
s
ts for criss-cross merges with v
a
r
io
u
s directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
t603
6
: criss-cross with weird content can foo
l
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t60
3
6: Add
differe
n
t
l
y
r
esolv
e
d modify/delete conf
l
ict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add failing t
e
stc
a
ses f
o
r rename/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah
N
ewren
t
6042: E
n
s
u
re rename/rename conflicts leave index and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t604
2
: Add tests
f
or conten
t
issues
with modify/
r
ename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add a testca
s
e where undete
c
te
d
rename caus
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t
6042: Add
a pair of cases where unde
t
e
cted renam
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add failing
testcase for re
n
ame/mo
d
ify/add-s
o
urce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t
6
042: Add a testcase where git deletes an untracke
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim Me
y
ering
f
etch: do no
t
leak
a
refspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
J
u
nio C H
a
m
a
no
Git 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C H
a
mano
Merge branc
h
'jk/m
a
int-config
-
alias-fix' into
m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
branch
'jc/f
m
t
-re
q
-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
M
erge branch 'jk
/
maint-docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
nio C Hamano
Mer
g
e branch '
j
n/doc-remo
t
e-helper
s
' into
maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merg
e
branc
h
'kk/
m
aint-prefix-i
n
-
conf
i
g-mak' into ma
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyering
diffcore-
r
e
n
ame
.
c: avoid set-but-not-use
d
warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C H
a
mano
S
tart 1
.
7
.
5
.
4
draf
t
release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge
b
r
an
c
h '
t
r/add-i-no-escape'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
mano
Merge
b
ranc
h
'vh/c
o
n
fig
-
intera
c
tive-singleke
y
-
doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C
Hamano
Merge branch 'ml/test-rea
d
me'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
e
rge branch 'ab/i18n-fix
u
p' into
m
aint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge bra
n
ch
'jc/
r
ename-d
e
gr
a
de-cc-to
-
c
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch
'rr/doc-
c
on
t
e
nt-
t
ype' into maint
commit
|
commitdiff
|
tree
2011-05-30
Jon
a
tha
n
Nieder
Docu
m
entation: do not misinter
p
r
e
t refspe
c
s as bo
l
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
i
o
C Ham
a
no
Me
r
ge branch '
j
m/mai
n
t-misc-
f
ix' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branc
h
'bc/maint-submodule-
f
ix-
p
a
r
ked'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C Hamano
Merge
b
ranch 'bc/m
a
int-api-do
c
-parked' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
no
M
e
r
g
e
b
ranch
'jn/
r
u
n-co
m
mand-error-failure' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
con
f
ig
.
m
a
k
.
in: allow "
c
o
n
figu
r
e --sysconf
d
ir=
/
e
lse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: fi
x
some a
n
tique example
out
p
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Kin
g
docs: make sure literal "->" isn't converte
d
to arrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs:
update status --porce
l
ain forma
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f
King
doc
s
: minor gram
m
ar fixes to
git-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
git-submo
d
ule
.
sh: separate parens by
a
spa
c
e t
o
av
o
i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
r
andon Cas
e
y
Documenta
t
ion
/
technical/api-d
i
ff
.
t
x
t: corre
c
t
n
ame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
rea
d
_g
i
t
file
_
g
ently: us
e
ssize_t to hol
d
read result
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remove tests of always
-
false conditi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim M
e
y
eri
n
g
r
erere
.
c: diagnose a cor
r
upt
MERGE_RR when hitting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
M
erge
b
ranch 'maint-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C Hamano
Merge branch 'jk/gi
t
-con
n
e
ction-deadloc
k
-f
i
x
'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
M
e
rge branch 'js/maint-send-pack-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
man
o
Merge branc
h
'jk/maint-uplo
a
d-pack-shallow' int
o
maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C H
a
mano
Merge branch '
j
m/maint-diff-
w
o
r
ds-w
i
t
h-sb
e
' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C H
a
mano
Mer
g
e branch 'kk/maint-prefix-in
-
config-mak' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge
b
ranc
h
'm
g
/
d
iff-uiconf
i
g-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge
br
a
nch 'ft/gitweb-tar-w
i
th-gzip-n'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C
H
ama
n
o
Merge branch 'ss/
d
oc-svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Ha
m
an
o
Me
r
ge branch 'jn/format-
p
a
t
ch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
H
a
mano
Merge branc
h
'j
c
/maint-pathspec-stdin-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Mer
g
e branch
'
jk/cherry-pick-root-with-resolv
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranch 'rg/co
p
y-gecos-
u
ser
n
ame' into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge branch 'fc/co
m
pletion-zsh
'
into maint
commit
|
commitdiff
|
tree
next