repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8
2019-05-14
Elija
h
Newre
n
f
a
st-ex
p
o
rt: differentiate betw
e
en ex
p
li
c
i
t
ly UTF-
8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
El
i
j
a
h Newren
fast-export: avoid stripping e
n
coding hea
d
e
r if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah Newren
f
a
s
t-im
p
ort: supp
o
rt 'enco
d
ing' co
m
mit head
e
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
t9350: fix enc
o
ding tes
t
to act
u
ally
t
e
st reencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
ijah Newren
fast
-
impo
r
t
:
fi
x
erroneous
h
a
n
dling of get-mark w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
N
e
wr
e
n
fast-
i
mport: only all
o
w
c
at-
b
l
ob requests w
h
ere
i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
N
e
w
ren
fast-i
m
port: check most prominent co
m
mands first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
git
-
fas
t
-impor
t
.
txt: fix wor
d
ing abo
u
t whe
r
e
l
s command
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
ijah
N
ewren
t9300: d
e
monstr
a
te
bu
g
with get-mar
k
and empt
y
orpha
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newren
merge-option
s
.
t
x
t: correct wording
of --no-commit option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Eli
j
ah N
e
wren
gi
t
-
r
ebas
e
.
tx
t
: update to
ref
l
ect
m
e
rge now im
p
le
m
ented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
E
lijah N
e
w
ren
log,diff-tre
e
:
a
dd --
c
ombined-all-paths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
El
i
jah Ne
w
ren
gi
t
-sh
o
w-ref
.
txt: fix orde
r
of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elij
a
h New
r
en
r
ebase
:
implement --merge via th
e
i
nteractive mac
h
inery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
ren
reb
a
se: defin
e
li
n
earization
ord
e
ring and
e
n
f
orce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
g
i
t-lega
c
y
-
rebase: simpli
f
y unnecessary
tr
i
pl
y
-nes
t
ed
if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah New
r
e
n
git-rebase, seq
u
en
c
er: extend --quiet optio
n
for
t
he
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
N
e
wr
e
n
am, r
e
base--m
e
r
g
e: do not ov
e
rl
o
ok --
s
kip'ed co
m
mits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
ren
t
54
0
7: ad
d
a
te
s
t demo
n
strating how interac
t
i
v
e ha
n
d
les
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
Newren
rebase
:
fi
x
incompati
b
le options error message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
ewren
r
ebas
e
: make builtin and l
e
gacy s
c
ript err
o
r me
s
sages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah Newren
git-rebase
.
txt: upda
t
e note about directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Ne
w
ren
fast-export: add
a
-
-s
h
ow-or
i
ginal-ids option
t
o show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-impo
r
t:
remove unmainta
i
ned
du
p
licate
documentatio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Ne
w
ren
fast-export: add --r
e
ference-exclud
e
d-parents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-expor
t
: ensu
r
e we e
x
port requested refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h Newren
f
ast-e
x
port: when using paths
,
avoid co
r
r
up
t
stre
a
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
f
ast-ex
p
ort: move
com
m
it re
w
riting logic int
o
a func
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
f
a
st
-
export
:
avoid dyi
n
g wh
e
n filte
r
in
g
by path
s
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-expo
r
t:
use va
l
u
e
from corre
c
t enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
git-fast-export
.
txt: clarif
y
misle
a
ding documentatio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h
N
e
wren
git
-
fast-import
.
txt
:
f
ix doc
u
m
e
n
tation
f
or
-
-quie
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
fast-export: con
v
ert sh
a
1 to oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6
0
36, t
6
043: incre
a
se code coverage fo
r
file
c
o
llision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
merge
-
recu
r
sive: impro
v
e rename
/
r
e
nam
e
(1to2)
/
add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah New
r
en
merge-recu
r
sive: use handle_file_collision fo
r
a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah
N
ewren
m
erge-recursive: im
p
rove hand
l
ing for renam
e
/re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge
-
rec
u
rsive: fix
rename/
a
dd co
n
f
l
ict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h Ne
w
ren
merg
e
-r
e
cursive: new functi
o
n
for bett
e
r
colliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newren
mer
g
e-recurs
i
ve:
increase
m
a
rker
len
g
th with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah New
r
en
t6
0
36
,
t6042: testcases for rename collision of alread
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
i
j
a
h Newren
t604
2
: add tests
f
o
r
c
onsist
e
ncy i
n
file
colli
s
io
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Newr
e
n
fsck: mov
e
f
s
c
k_he
a
d_lin
k
()
to g
e
t_default_head
s
()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah
Newren
merge-r
e
cu
r
s
i
ve: av
o
id showing con
f
li
c
ts with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah New
r
en
mer
g
e-recursive: impro
v
e auto-
m
erging messages
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
El
i
jah Newren
commit: fix erroneou
s
BUG, '
m
ulti
p
le renam
e
s on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-re
c
u
r
sive: renam
e
me
r
ge
_
fi
l
e_1() and m
e
r
g
e_cont
e
nt()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
mer
g
e-recursive: remove fi
n
a
l
remaining caller of merge_f
i
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recursi
v
e
:
avoid wrappe
r
function when unnecess
a
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
m
e
r
ge-
r
ecursive
:
set paths c
o
rrectly
w
he
n
three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
se
q
uencer: fix
-
-
allow-empty-
m
essage behavior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
upd
a
te-
r
ef: all
o
w --no
-
deref
w
ith --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
E
l
ija
h
Newren
update-
r
ef: fix
type of update_flags variable to m
a
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
rere
r
e
: avoid buffer overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
El
i
jah Newren
t
4200:
demonstrate r
e
rere segfault on sp
e
cial
l
y
cr
a
ft
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
Re
m
ove
super
f
luous t
r
a
i
l
ing semicol
o
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
N
ewren
am: avoid direc
t
ory rename detection when calling recur
s
ive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
li
j
ah Ne
w
ren
m
erge-
r
ecurs
i
ve:
add ability to t
u
rn off
d
irectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newren
t3
4
01: add another dire
c
tory rename testcase
for reb
a
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
i
jah N
e
wren
Remove fo
r
ward de
c
lara
t
ion of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
compa
t
/precompos
e
_utf
8
.
h: use more common include g
u
ard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
urlmatch
.
h: fix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah N
e
wren
Move definition
o
f
enu
m
branch_
t
r
ack from cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ija
h
Ne
w
ren
a
lloc: ma
k
e
allocate_alloc_sta
t
e
and clear_alloc_s
t
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
r
en
Add missing
inc
l
udes and forwar
d
d
ecla
r
ations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
git-upda
t
e-index
.
txt:
r
eword p
o
ssibl
y
confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
N
ewren
t
7
406: av
o
i
d using test_must_fail for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewren
t7
4
06: prefer test_
*
help
e
r functions to te
s
t
-
[
fed
s
]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: avoid
having git co
m
mands upstre
a
m of
a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406:
s
i
mplify by using diff
-
-name-only inst
e
ad of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
Newren
t7
4
06
:
fi
x
c
a
ll
t
ha
t
was failing for the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elij
a
h
Ne
w
ren
t
3
03
1
:
u
pdate test
description to
m
e
n
tion
d
esired
behavio
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
lijah
N
ewren
read-cache: fix
directo
r
y/
f
ile conflict handling
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t10
1
5: demonstr
a
te directory
/
file con
f
lict rec
o
very
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newr
e
n
me
r
ge-
r
ecu
r
sive: preserve s
k
ip_w
o
rktree bit when
n
eces
s
ary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
a
h Newren
t
7
405: verify 'merg
e
-
-abort'
w
orks after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Ne
w
ren
t7405
:
add a directory/submodu
l
e conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah New
r
en
t7405: add a file/submodule co
n
flict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge:
f
ix mislea
d
ing p
r
e-merge check doc
u
mentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah
Newren
merge-recurs
i
ve: enforce
r
ule tha
t
i
n
dex matches he
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lija
h
N
ewren
t6
0
4
4
: add m
o
r
e
testcas
e
s with s
t
aged chang
e
s before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah
Newren
merge-recursive: f
i
x assumption that head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-re
c
ursive:
mak
e
sur
e
when we
s
ay we abor
t
that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h N
e
wren
t6044: add
a testc
a
se for index
m
atching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6036: add a f
a
iled conf
l
i
c
t detection case: reg
u
lar
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newr
e
n
t603
6
: add
l
ots of detail for
directory/fil
e
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: add te
s
t
c
ase covering long chains of ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wr
e
n
t6
0
42: add testcase covering rename/r
e
name(2to1
)
/de
l
ete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newr
e
n
t
6042: add testc
a
se
c
o
verin
g
ren
a
m
e
/add/delete
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a
f
ailed co
n
flic
t
detection ca
s
e with co
n
flic
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
li
j
ah Newren
t60
3
6
:
add
a failed confl
i
ct
d
etection case w
i
th s
u
bmodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036:
a
dd a failed conf
l
ict det
e
ction case with
subm
o
dule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah New
r
en
t
6
036: add a
failed conflict detection case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah
N
ewren
t6036:
a
dd a failed conflict detectio
n
c
ase wi
t
h symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wren
t6044: verify tha
t
mer
g
es exp
e
cted
t
o
abort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
ind
e
x_has_changes(): av
o
i
d assuming operating on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
read
-
cache
.
c: m
o
ve index_has
_
changes() from mer
g
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah N
e
wren
t
5
407: fix test to
c
over in
t
en
d
ed arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Eli
j
ah New
r
en
apply: fix
g
rammar
e
rror in
com
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
git-rebase--me
r
ge
:
modernize "git-$cmd" to "git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next