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
commit doc: document that -c, -C, -F and --fixup with -m error
2010-09-30
Elij
a
h Newren
m
e
rge-recursive:
S
tru
c
t
u
re
pr
o
c
e
ss
_
df_entry() to hand
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-r
e
cursive: Have p
r
oces
s
_e
n
try() sk
i
p
D/
F
or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-recu
r
s
iv
e
: Ne
w
function
t
o assist resolving
r
enam
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge-recursive
:
N
e
w
d
ata
structures for deferring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ija
h
Newren
me
r
ge-recursive:
Move
p
roc
e
ss_entr
y
's content
m
e
rging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-recu
r
s
i
ve: Move delete
/
m
odify h
a
ndling into dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Newren
merge-recur
s
iv
e
: Mov
e
rename/de
l
ete handli
n
g
i
n
to dedicat
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Nuke rename/dire
c
t
ory conflic
t
detecti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
ren
merge-rec
u
rsive
:
Rename conf
l
ict_rename_
r
ename
*
() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recu
r
s
ive:
Small code
c
l
arifica
t
ion -- variabl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6
0
36:
A
d
d testcase for undetected
c
onflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
t6036: Add
a
s
e
cond testcase simila
r
t
o the firs
t
but
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
N
ewren
t6036:
T
est in
d
ex and worktr
e
e
s
tat
e
, not just that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
t6020: Add a testcase for
modi
f
y
/
delete + dir
e
ctory
.
.
.
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
Elijah Newren
t6022: Add tests
f
o
r
renam
e
/rename combined with D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Ne
w
ren
t6022: Add paired
rename+D/F conflict: (tw
o
/fil
e
,
o
n
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t6
0
22:
A
d
d
tes
t
s with both rename sou
r
ce &
dest
i
n
v
o
lv
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add tests for rev
e
rs
i
ng order of mer
g
es
w
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
ren
t6022: Ad
d
te
s
t comb
i
n
ation
s
o
f {con
t
e
n
t conflict?
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
N
ewren
t
6
032: Add a te
s
t checking
f
or excessiv
e
outp
u
t from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah New
r
en
merge-
r
ec
u
rsive:
D/F conflict
s
where was_a_
d
ir/file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-10
Eli
j
ah Ne
w
ren
t3
5
09: Add r
e
name
+ D/F confl
i
ct
t
estcas
e
that recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Ne
w
ren
revert: Fi
x
trivial comment style issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah
N
ewre
n
cache_tree_free: F
i
x small me
m
ory leak
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
diff_tree():
S
k
ip skip_
u
n
i
nt
e
restin
g
() whe
n
all
r
emainin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tr
e
e_entr
y
_interes
t
ing(): Make re
t
urn va
l
ue more s
p
e
c
if
i
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tree-walk: Co
r
rect bi
t
rotted commen
t
a
b
o
ut
t
r
e
e_entry()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
Do
c
ument pr
e
-condition for t
r
ee_entry_interest
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-25
Elijah N
e
wren
tree-walk: Correc
t
bi
t
rot
t
ed comment about t
r
ee_e
n
try()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
E
lijah Newren
m
e
rg
e
-recursive: Avoid e
x
cessi
v
e output for
and
r
e
processing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah N
e
wren
me
r
ge-recursiv
e
: Fix
m
ultiple
f
ile r
e
name acro
s
s D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
Ne
w
ren
t6031: A
d
d a testcase cov
e
ring multiple renames acr
o
ss
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elija
h
Newr
e
n
mer
g
e-recur
s
ive: Fix typ
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Ma
r
k tests
t
hat use symlinks a
s
needin
g
SYMLINKS pre
r
equisite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elij
a
h
Ne
w
ren
pul
l
-
-
r
ebase: Av
o
id spurious conflicts and
r
ea
p
plying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
l
i
j
ah Newren
t5520-pull
:
Add
testca
s
es showing sp
u
rio
u
s conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah
N
ewren
up
l
oad-pack: Improve error message whe
n
ba
d
r
e
f req
u
ested
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elijah
Newr
e
n
fas
t
-expor
t
: Add a --full-tree option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
E
lijah Newren
fast-export:
Fix dr
o
ppi
n
g of fi
l
es with
-
-impo
r
t-marks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
f
ast-imp
o
rt:
I
mp
r
ove robustness when
D
-
>
F changes pr
o
vided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
Newren
fast-expo
r
t: Fix output or
d
e
r
of D/F changes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merg
e
_recursiv
e
:
F
ix rena
m
e
s
acros
s
paths below D
/
F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
E
l
i
jah N
e
wren
merge
-
re
c
ursive:
Fix D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
Add addit
i
o
nal
testc
a
s
e
s
for
D
/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah
N
ewren
fa
s
t-
e
xport:
Document the fa
c
t tha
t
git-rev-list arg
u
me
n
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
j
a
h
Newren
Ad
d
new fast-export testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
jah Newren
fast-ex
p
or
t
: Ad
d
a --tag-of-filtered-
o
bj
e
ct o
p
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
El
i
jah Newren
fast
-
export: Do parent r
e
writing to
a
void dropping
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah N
e
wren
fast-exp
o
rt: Mak
e
sure we
s
h
ow actual ref names in
s
tea
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-exp
o
rt:
Omit tags that tag tree
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah New
r
en
fast-exp
o
r
t
:
Set r
e
vs
.
topo_order before ca
l
ling setup_r
e
vi
s
i
o
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elijah Newren
git
k
: Make more options easily accessibl
e
f
rom Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newren
fast-expor
t
: Avoid dropping files fro
m
commits
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
E
l
ijah Ne
w
r
e
n
C
orrect
m
issing SP characters in grammar
c
omment at
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
El
i
ja
h
Newren
git
-
filter-branch: avoid
colli
s
i
o
ns with variabl
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah
Newr
e
n
Ensur
e
proper s
e
tup of git_dir fo
r
git-hash-objec
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elij
a
h
N
ewren
fa
s
t-export: ensure we traver
s
e
c
o
mmits in t
o
pologic
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree