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-recursive: New data structures for deferring of D/F conflicts
2010-09-30
Elijah Newren
me
r
g
e
-
rec
u
rsive: New da
t
a structures for
deferring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-recursive: Move process_ent
r
y's con
t
ent
m
e
rging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-r
e
c
ursive: Mo
v
e
d
e
lete/
m
odify handlin
g
into dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
m
e
rge-recursive: Move re
n
a
m
e
/d
e
lete
h
andling i
n
to
dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-rec
u
r
s
ive: Nuke re
n
ame/directory
c
o
n
fl
i
ct dete
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewre
n
merge-recu
r
sive
:
Rename conflict_rename_rename*(
)
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-recursiv
e
: Small code
cl
a
rificati
o
n -
-
variable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t603
6
: Add tes
t
case for undetected
conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ew
r
en
t60
3
6: Ad
d
a s
e
cond tes
t
case si
m
ilar to
the firs
t
b
ut
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
t6
0
36: T
e
s
t
i
ndex and
w
orktree
state
,
not just
t
h
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
Newren
t6020: Ad
d
a testcase for mod
i
fy/de
l
ete
+ directo
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
t6020:
M
oderni
z
e
s
t
y
le a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add t
e
sts for r
e
name/rename combined
with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t6022: A
d
d pai
r
ed rename+D/F conflict: (two
/
file, one
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Ne
w
ren
t
6
022:
A
dd tests w
i
th
b
oth
r
ena
m
e source & dest
involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022:
Add t
e
sts
f
or r
e
v
ers
i
ng o
r
der of merges when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
N
ewren
t6022: Add
test combi
n
ati
o
ns of {
c
o
ntent conf
l
ict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6032:
A
dd a te
s
t ch
e
cking
f
or
e
xc
e
s
s
iv
e
ou
t
put from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Eli
j
ah
N
ewr
e
n
merge-re
c
ursive
:
D/F conflicts whe
r
e was_a_d
i
r
/
f
i
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t3509: Add rename + D
/
F
conflic
t
test
c
a
s
e
t
h
at recursi
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah New
r
en
revert: Fix trivial c
o
mment sty
l
e issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
E
l
ijah
Newren
cach
e
_tree_free: Fix small memory leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
El
i
jah
N
ewren
tree-walk:
C
orrect
b
it
r
otted comm
e
nt about tree_entry(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Eli
j
ah Newr
e
n
merge-
r
ecursive:
A
v
oid exces
s
i
v
e o
u
tput fo
r
a
nd r
e
pr
o
ce
s
s
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah N
e
w
ren
merge-recursive: Fix
m
u
ltiple
f
ile
r
ename across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
N
ewren
t
6
03
1
: Add
a tes
t
case
c
o
v
eri
n
g multiple ren
a
m
es acro
s
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
N
ewren
merge-recursive: Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Mark tests
t
hat use sym
l
inks as needi
n
g
SYMLINKS pr
e
requisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah
Newren
pull --re
b
a
se
:
Avoid spurious confl
i
c
t
s and reapplying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520-pull:
A
dd t
e
stcases
s
howing spu
r
ious confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
E
l
ijah
N
e
w
ren
upload-pack: Improve err
o
r message w
h
en bad ref re
q
u
ested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Ne
w
re
n
fa
s
t
-export: Add a --
f
ull
-
tree option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-export: Fix dropp
i
ng of
f
iles with --import-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah N
e
wren
f
ast
-
import:
I
mp
r
ov
e
r
obustness
when D->F changes provided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Ne
w
r
e
n
fast-export: Fix out
p
ut
order of D/F c
h
anges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah Ne
w
ren
merge_rec
u
rs
i
ve: Fix renames
a
cro
s
s
pat
h
s belo
w
D
/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah Newren
merge-recursiv
e
: Fi
x
D/F confl
i
c
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newr
e
n
Add additional testcases f
o
r D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h
Newr
e
n
f
a
st-e
x
por
t
: Document
t
he f
a
ct that git-rev-
l
ist arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
N
ewren
A
d
d
new fas
t
-ex
p
ort tes
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah
N
ewren
fast-expor
t
: Add a --
t
ag-of-filt
e
red-
o
bject optio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h Newre
n
fast-export:
D
o pare
n
t rewr
i
ting to a
v
oid d
r
opping
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah Newren
fast-export: Make s
u
re we show actual re
f
names inst
e
ad
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
Newren
f
ast-export: Omit ta
g
s that
t
ag
trees
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
j
ah Newren
fast-ex
p
ort: Set
revs
.
topo_order be
f
ore call
i
ng set
u
p_re
v
i
sio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
E
lijah
Newren
gitk: Make m
o
re options easily accessibl
e
from E
d
it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah
N
ewren
fast-e
x
port
:
Av
o
id droppi
n
g files from c
o
mmits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
C
o
rr
e
ct missing SP cha
r
a
c
te
r
s in grammar comment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah
Ne
w
ren
git
-
filter-bran
c
h
:
avoid col
l
isions with variab
l
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah New
r
e
n
Ensure
proper setu
p
of git_dir for
git-hash-object
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah Newren
fas
t
-export: ensure we trave
r
se commits
i
n
t
o
p
o
l
o
g
ical
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree