repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/update-contrib-example-merge'
2010-08-25
E
lija
h
Newren
tre
e
-walk
:
Corre
c
t bitrotted co
m
ment about tree_ent
r
y()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
m
erge-r
e
cursi
v
e: Avoid
e
x
c
e
s
s
i
ve output f
o
r and reprocessi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah
N
ewren
merge-recursive: Fix mult
i
p
l
e file rena
m
e
across D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t
6
031: Add
a testcase covering multip
l
e renames across
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Elij
a
h Ne
w
ren
m
er
g
e
-
r
e
c
ursiv
e
: Fix typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
E
lijah Newren
Mark tests
that us
e
symlinks as needing SYMLINKS prereq
u
isite
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull --reb
a
se: Avo
i
d spurious confli
c
ts and reapplying
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Ne
w
ren
t
5
520-pull: Add te
s
tcases sh
o
wing sp
u
rious c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-08-02
Elijah
New
r
e
n
upload-
p
ack: Improve error mess
a
ge
w
hen b
a
d
r
ef reque
s
ted
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Eli
j
ah Newren
fast-expo
r
t
: Ad
d
a
--full
-
tree
o
ption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
Elij
a
h N
e
wren
f
a
s
t-export
:
Fi
x
dropping of fil
e
s with --import-ma
r
ks
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newre
n
fast-import: Impr
o
v
e
robustness when D->F changes provided
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
fast-ex
p
o
rt: Fix
o
u
t
pu
t
order
o
f D/F cha
n
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merg
e
_recursive: Fix rena
m
es across path
s
below
D/F
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah Newren
merge-recursive: Fix
D
/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
j
ah Newren
Add addition
a
l
te
s
tcases for D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah Newren
fast-expo
r
t: Document the fact
that git
-
r
ev
-
list argum
e
nts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ija
h
New
r
e
n
A
d
d
n
ew fast-exp
o
r
t
testcase
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah N
e
w
ren
fast-export: Add a -
-
t
ag-
o
f-f
i
lte
r
ed-object optio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah New
r
en
f
ast-expo
r
t: Do paren
t
rewriting to
avoi
d
d
roppi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
E
l
ijah N
e
w
ren
fa
s
t-export: Make sure we show actual r
e
f
n
am
e
s inste
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elijah Newr
e
n
fast-exp
o
rt: Om
i
t ta
g
s
t
h
at
t
a
g
t
ree
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-06-27
Elij
a
h
Newre
n
f
a
st-export:
Set revs
.
topo_order before calling setup_revision
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-05-16
Elijah Newren
gitk: Make more options eas
i
ly access
i
ble
from Edit
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-26
Elijah Newr
e
n
fa
s
t
-ex
p
ort: Avoid dropping files from comm
i
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah New
r
en
Correc
t
missing
SP ch
a
racters in grammar comment a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-03-25
Elijah Newren
git-fil
t
er-branch: avoid c
o
lli
s
io
n
s with va
r
iables
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-28
Elijah
N
e
wren
Ensure p
r
oper setup of git_dir
for git
-
has
h
-
o
bje
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2009-02-12
Elijah
N
e
w
ren
fa
s
t-ex
p
ort: ensure
we tr
a
ver
s
e commits in topological
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
