repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
worktree: say that "add" takes an arbitrary commit in short-help
2010-09-30
Elijah Ne
w
ren
merge-recursi
v
e: Structur
e
p
r
ocess_df_entry() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah New
r
en
m
erg
e
-
r
ecursive: Have process_entry() skip D/F
o
r renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-re
c
u
r
sive
:
New function to
assist
resolving renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
N
e
wren
me
r
ge-r
e
cursive: New data structures for def
e
rring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
merge-rec
u
rsive: Move process_entry's conten
t
merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recurs
i
v
e
: Move
delete/modi
f
y h
a
ndli
n
g
into dedic
a
ted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lij
a
h Ne
w
ren
me
r
ge-recursiv
e
: M
o
ve rename
/
delete hand
l
in
g
into de
d
icated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
merge-re
c
ursive: Nuke r
e
name/
d
ire
c
tory conflict
detection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
e
w
r
en
merge-recursive:
R
ename co
n
flict
_
r
ename_rename*() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
merge-recursive:
Sma
l
l code clarification -- v
a
riable
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Add testcase for undetected con
f
lict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h New
r
en
t
6
036: Add a
second t
e
stcase similar
to the f
i
r
st but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6
036: Test inde
x
and
w
orktree state, not ju
s
t that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6020:
A
d
d
a
testcas
e
for modify/dele
t
e + directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
ja
h
N
e
wren
t6020:
Moder
n
ize style a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Ne
w
ren
t6022: Add tests
f
or rena
m
e/r
e
name combined
with
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
a
h Newr
e
n
t602
2
: Add p
a
ired rename+D/F conflict:
(two/file
,
o
ne
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
t6022: Add tests with both rename source & dest involve
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
t6
0
22: A
d
d
t
est
s
for reversing o
r
der of
merges when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
N
e
w
r
en
t6022
:
Add test com
b
i
n
ati
o
n
s
of
{
content conflict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
t6032: Add
a
test check
i
n
g
for
excessive o
u
t
pu
t
from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Ne
w
ren
merge-recursi
v
e:
D/F c
o
n
f
l
icts where
w
as_a
_
dir/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
E
l
ij
a
h Newren
t3509: Add
rename + D/F conflict
testcase that recursiv
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah N
e
wren
revert: Fix tri
v
ial
comment
style
issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Eli
j
ah
Newren
c
a
che_tree_free: Fi
x
small
mem
o
ry leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah
Newre
n
diff_tree(): Skip s
k
ip
_
u
ninteresting() when a
l
l remaining
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tree_entry_
i
n
t
e
r
e
s
tin
g
(): Make retu
r
n value more
s
pecifi
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah
N
ewren
tre
e
-walk
:
Correct b
i
trotted
comme
n
t about t
r
ee_entr
y
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Eli
j
ah Newren
Document
p
r
e-condition for tree
_
entr
y
_inter
e
sting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
E
l
ij
a
h
N
ew
r
en
tree-walk: Correct bitrott
e
d comm
e
nt about tree
_
entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
E
lijah Newren
m
erg
e
-r
e
c
ursi
v
e:
A
void ex
c
essiv
e
output
f
or
a
n
d rep
r
ocessi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elija
h
Newren
merge-recursive: Fix multiple file rename across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
N
ewren
t6031: Add a
testcase c
o
verin
g
m
u
l
t
iple renames a
c
ross
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
Newre
n
merge-recursi
v
e: Fix t
y
p
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
ah New
r
en
Mark t
e
sts
t
ha
t
us
e
symlinks as n
e
eding SYM
L
INKS
prerequisit
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ijah
N
ewren
p
ul
l
--rebase: Avoid spurious conf
l
icts and reap
p
lying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ijah Newren
t55
2
0
-
pull: Add testcas
e
s
s
h
o
wing spurious conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
E
l
ija
h
New
r
en
u
p
load-pack: Im
p
rove error
m
e
ss
a
ge when
b
a
d ref requested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah
N
ew
r
en
fast-
e
xport
:
Add
a --full-t
r
e
e
o
pt
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah Newre
n
fast
-
ex
p
ort: Fix dropping of files wi
t
h
--import-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ijah
N
ewren
f
a
s
t-import: Improve
r
obustness w
h
en D-
>
F changes prov
i
ded
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
ija
h
Ne
w
ren
fast-ex
p
ort
:
Fix output order
o
f D
/
F
c
h
anges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
mer
g
e_recurs
i
ve: Fix renames a
c
ross paths below D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
El
i
j
ah Newren
merge-recursive
:
Fix D/F con
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
Add addit
i
onal test
c
ases for D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Eli
j
ah
N
ewren
fast-export: Docum
e
nt the fac
t
th
a
t git-
r
ev-list ar
g
ument
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h Ne
w
ren
A
d
d
new fast-export testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-export
:
Add a --ta
g
-of-filtered-object opt
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah N
e
wren
fast-export:
D
o pa
r
e
n
t r
e
w
r
iting to
a
vo
i
d droppi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lij
a
h Newre
n
f
ast-export: M
a
ke sur
e
we show ac
t
ual ref names ins
t
ead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
lijah Newren
fast-export: O
m
it tags that ta
g
tr
e
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Ne
w
ren
fa
s
t-expo
r
t:
S
et re
v
s
.
t
o
po_
o
r
d
e
r
before calling s
e
tup_revisio
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elijah Newr
e
n
g
i
t
k: Make more
options ea
s
ily accessible from
Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah N
e
wren
fa
s
t
-
export: Avoi
d
dropping files from commi
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newre
n
C
orrec
t
m
i
ssing SP characters in gr
a
mmar comment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
E
li
j
ah Newr
e
n
git
-
filter-branch
:
av
o
id c
o
llisions wi
t
h variables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah N
e
wr
e
n
Ensure proper s
e
tu
p
of git_dir for git-hash-obj
e
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elij
a
h Newren
fa
s
t
-export: ensure we traverse co
m
mits
i
n topologica
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree