repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Move delete/modify handling into dedicated function
2010-09-30
Elijah New
r
e
n
m
erge-recursive: M
o
ve delete/modify ha
n
dling
i
n
t
o dedicated
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recu
r
sive: Move rename
/
dele
t
e handling
int
o
de
d
icate
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-re
c
urs
i
ve: Nuke re
n
ame/dir
e
ctory conflict
d
etection
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Ne
w
ren
merge-recursiv
e
:
Rename conflict_rename_rename*() f
o
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge-r
e
cur
s
ive: Small
c
o
d
e clarification -- variable
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
t6036: Add
testc
a
se for undetecte
d
conf
l
ict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
ja
h
Newre
n
t6036: Add a secon
d
testcase s
i
milar
to
t
he first but
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
t
6036: Te
s
t i
n
d
e
x and
worktree st
a
t
e,
not j
u
st that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wr
e
n
t
6020: Add a testcase for
modify/delete + direc
t
o
r
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020: Modernize
style a bit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newren
t
6
0
2
2:
A
d
d
test
s
for ren
a
me/rename c
o
mbined with D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newr
e
n
t6022: Add paired renam
e
+D/F c
o
nflict: (
t
w
o/f
i
l
e
, one
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newr
e
n
t
60
2
2: Add
t
ests
w
i
t
h both rename source & des
t
i
n
vol
v
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
t
6022:
A
dd tests for reversin
g
order of merg
e
s
when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Newren
t6022: Ad
d
tes
t
combinations of {cont
e
nt confli
c
t?
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t60
3
2
:
Add a tes
t
che
c
king
f
or e
x
cessi
v
e
o
u
tput fr
o
m
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
E
lijah
N
ewr
e
n
merge-r
e
c
u
rsiv
e
: D/F
c
o
nflicts where w
a
s_a_d
i
r
/
file
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
Eli
j
ah N
e
wr
e
n
t3509:
Add rename + D/F c
o
nflic
t
tes
t
case th
a
t recur
s
i
ve
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
revert:
F
ix triv
i
al co
m
m
ent
s
t
y
le i
s
sue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Eli
j
a
h
Newren
cache_tr
e
e_free:
F
ix small m
e
mory leak
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-25
E
lijah Newre
n
tree
-
walk:
Correct bi
t
rotted commen
t
about
tree_entry()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
El
i
jah Ne
w
r
e
n
merge-recur
s
i
v
e: Avoid excess
i
ve output for and reprocessing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
E
l
ija
h
Newren
merge
-
r
ecursiv
e
: Fix
mu
l
tiple file
rename across D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
E
l
ijah
N
e
w
ren
t603
1
: Add
a
t
e
stcase c
o
ve
r
ing multiple renames acros
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
Newren
me
r
ge-re
c
ursive:
F
ix
typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah
N
ewren
Mark tests that u
s
e symlinks
as needi
n
g SY
M
L
IN
K
S
prerequisite
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah N
e
wren
pull --re
b
ase: Avoid
s
p
urious
conflict
s
and reapplying
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520-pu
l
l: Add
testca
s
es s
h
owing
spurio
u
s conflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Eli
j
ah Newren
uplo
a
d-p
a
ck: Impro
v
e er
r
o
r
message
when
b
a
d ref
r
equested
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
El
i
j
ah Newren
fast-e
x
port: Add a --fu
l
l-tree option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newren
fast-expor
t
: Fix
d
ropping of f
i
les with --i
m
port
-
ma
r
ks
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newre
n
fast-i
m
port: Impr
o
ve robustness when D->F changes
provided
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newr
e
n
fast-export: Fi
x
o
u
tput order o
f
D/F
change
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
mer
g
e_recursive: Fix renames across pa
t
hs below D/F
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
E
lijah Ne
w
ren
m
e
rge-recursiv
e
:
Fix D/F
c
onf
l
icts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
a
h
New
r
e
n
A
d
d additional tes
t
cases for D/F
confl
i
cts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h Newren
fast-export: D
o
cum
e
nt the
f
act that git-rev-
l
i
st arguments
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah Newren
Ad
d
new fast-
e
xport testca
s
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-exp
o
rt: A
d
d a
--t
a
g-
o
f-filtered-object option
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
Newren
fast-
e
xport: Do parent rewriting to
avoi
d
dropping
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Ne
w
ren
fast-expo
r
t:
M
a
ke sur
e
we show a
c
tual ref names
i
n
stead
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah Newren
f
ast-ex
p
ort: Omit tags that tag trees
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
Newren
f
a
st-export: S
e
t revs
.
topo_order before
c
a
l
ling setup_
r
evisions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-16
Elijah Newren
gitk: M
a
ke
m
ore
options easily access
i
ble fr
o
m E
d
it
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-26
E
l
ijah
N
ewren
fast-
e
x
p
ort:
Avoid dropping files from commits
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
Correct
m
issi
n
g SP characte
r
s
in grammar comment
a
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
git-filter-branch:
avoid c
o
llisions with varia
b
les
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-28
E
l
ijah New
r
en
En
s
u
re proper s
e
tup of git_dir
f
or git
-
h
a
sh-object
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-12
E
lijah Newren
fast-e
x
p
o
rt: e
n
sure we traverse commits
in topologica
l
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree