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
merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
2010-09-10
Elijah Newren
merge-r
e
cur
s
ive
:
D/F conflic
t
s whe
r
e was_
a
_d
i
r/file
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-10
Elijah Newren
t3509: Add ren
a
me + D/F con
f
li
c
t testca
s
e that recu
r
s
i
ve
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
re
v
ert: Fix trivial c
o
m
m
en
t
s
t
y
le
issue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-09-07
E
lijah
N
e
wren
c
a
che_tree_free: F
i
x
smal
l
memory leak
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
El
i
ja
h
Newren
diff_
t
re
e
(): S
k
ip sk
i
p_
u
ni
n
terestin
g
() when
a
l
l remaining
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tree_entry_inte
r
esting():
M
a
k
e
return value more specifi
c
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elijah N
e
w
r
en
t
ree-walk: Correct
b
itr
o
tted c
o
mment about tree_
e
ntry(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elijah
N
ewren
Document p
r
e-cond
i
tion for tree_
e
ntry_interes
t
ing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-25
Elijah Ne
w
r
en
tree-walk:
C
orrect bitrotted comment about tree_entry()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newr
e
n
me
r
ge-recursive: Av
o
i
d
ex
c
es
s
ive output for and
rep
r
oc
e
ssing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
Newren
merge-re
c
u
r
sive: F
i
x
mu
l
tiple file
r
ename
a
cross D
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newre
n
t603
1
: Add a testca
s
e covering mult
i
p
l
e renames across
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
El
i
jah N
e
wre
n
m
erge-recu
r
si
v
e:
Fix typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Mark tes
t
s th
a
t u
s
e symli
n
ks as needing SYML
I
NKS pre
r
equ
i
site
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Eli
j
ah
N
e
wren
pull --rebase: A
v
oid spuri
o
u
s co
n
f
l
icts
and reapplyi
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520-pull: Add te
s
tcases showing spurious
c
onfli
c
ts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-02
Elij
a
h New
r
en
uploa
d
-
pack: Improve erro
r
m
ess
a
ge
when bad ref requested
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Elijah N
e
wren
fast-export: Ad
d
a
--
f
ull-tree o
p
tion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
E
l
i
jah
Newren
fa
s
t
-
export: Fix dr
o
pping of fi
l
es with --imp
o
rt-mar
k
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
ah Newren
f
ast-i
m
port: Improve robustness whe
n
D->F changes provi
d
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
fast-
e
xport
:
Fix
o
utput order of
D
/F changes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
ah Newren
m
erge_r
e
cursive: Fix renames across paths
b
e
l
ow D/F
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
El
i
jah Newren
merge
-
r
e
cursi
v
e
: Fi
x
D/F c
o
n
f
l
i
cts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-09
Elij
a
h
Newren
A
d
d addi
t
ional
t
est
c
a
s
es for D/F
conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newren
fast-export: Do
c
ument th
e
fact
that git-rev-list arguments
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah N
e
wren
Add new fast-export testc
a
ses
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah Newren
fast-e
x
port: Add
a
--tag-of-filtered-object option
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elija
h
N
ewr
e
n
fast-e
x
port: Do parent
r
ewr
i
ting to
a
voi
d
dropping
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
Elijah
N
ewren
fa
s
t-export: Make
s
u
re we
sho
w
actual ref names instead
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
El
i
j
ah
N
e
w
r
e
n
fast-ex
p
ort:
O
mit tags t
h
at
t
a
g tr
e
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-27
El
i
j
ah Newren
fast-expo
r
t: Set r
e
vs
.
topo_order before calling setup_re
v
isions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-16
Elijah New
r
en
gitk: Make
m
ore options easily accessible
fr
o
m Ed
i
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newren
fast-expor
t
: Avoid dropp
i
ng file
s
f
r
om commi
t
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
Elijah
Ne
w
ren
Correct missi
n
g SP charac
t
ers in g
r
amm
a
r
c
om
m
ent at
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
git
-
filter-branch
:
av
o
id c
o
l
lisio
n
s with var
i
ables
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-28
Elijah
Newren
Ensur
e
proper setup of git_dir for git-
h
as
h
-object
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-12
E
l
ija
h
Newren
fast-export: ens
u
re we tr
a
v
e
rse commit
s
in t
o
pological
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree