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
dir: remove stray quote character in comment
2019-12-11
Elijah Newren
dir: remove s
t
ray quote char
a
cter in co
m
m
e
nt
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newr
e
n
Rev
e
rt "d
i
r
.
c: make 'git-status --ignored' work within
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah
Newren
t30
1
1
:
demo
n
stra
t
e directory trave
r
sal fail
u
r
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
E
lijah Newren
Rel
N
otes/
2
.
24
.
0: fix self-co
n
t
r
adic
t
ory note
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
Elijah
N
ewren
RelN
o
tes/2
.
24
.
0: typofix
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newr
e
n
merge-recursive: fix
the fix to the diff3 common
a
ncestor
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
E
lij
a
h Newren
f
a
s
t
-export
:
hand
l
e ne
s
ted tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah Newren
t9350: add tests f
o
r tag
s
o
f
t
hing
s
o
t
her than
a
c
ommit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
El
i
j
ah Newren
f
ast-export: allow user to request tags be marked wi
t
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah Newren
fast-expo
r
t: add sup
p
ort fo
r
-
-import-marks-if-ex
i
st
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah Ne
w
r
e
n
fast-
i
mport: add suppo
r
t
for new 'alias' comman
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h N
e
wre
n
fast-impo
r
t: al
l
ow tags
to be ide
n
t
i
fied
b
y mark labe
l
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast
-
import: fix
h
a
n
dling of dele
t
e
d
tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newr
e
n
merge-recursive:
f
ix the diff3 common ancestor label
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
E
l
ijah Newren
dir:
specia
l
case
c
hec
k
for the po
s
sibil
i
t
y
that
p
athspec
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-28
E
lij
a
h Newren
fast-
e
xport: fix e
x
porti
n
g a tag and nothing
el
s
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h
Newren
clean: fix
theoretical pat
h
corruptio
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ija
h
Newren
c
lean: re
w
rap over
l
y
long l
i
ne
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
clean: a
v
oid r
e
moving untracked file
s
in a nested gi
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newr
e
n
cle
a
n: disa
m
biguat
e
t
he de
f
inition of -d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
git-clean
.
txt: do not claim we will delete files w
i
th
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
dir: add commenta
r
y e
x
plaining match_pathspe
c
_item
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
dir: if our pat
h
spec might match files under a dir
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
lija
h
Newren
dir: make the DO_MATCH_SUBMO
D
ULE code reusable for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
d
ir: also check
d
i
r
ectories for matching pa
t
h
sp
e
cs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newre
n
d
i
r:
fix off-by-one error in m
a
tc
h
_p
a
thspec
_
item
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir: fix typo
i
n
comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Ne
w
ren
t
730
0
:
a
d
d
te
s
tcases showing failu
r
e to clean
s
pecified
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah N
e
w
ren
t9
9
02: use
a non-deprecate
d
command f
o
r testing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
lij
a
h N
e
wren
Recommend git-filter-repo instea
d
of g
i
t-filt
e
r-
b
ran
c
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah
Newre
n
t6006:
simplify, fix,
and optimize empt
y
message tes
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t
3
427: acce
l
erate this
t
e
st by
u
sing fast-e
x
port
a
nd
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-01
Elij
a
h Newr
e
n
merge-o
p
tions
.
txt
:
clarify
m
eaning of various
f
f-rel
a
t
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah New
r
en
merge-re
c
ursive: al
p
habetize i
n
clude list
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ij
a
h
Newre
n
merg
e
-recursive: add
sani
t
y c
h
ecks for relevant merge_o
p
tions
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h New
r
en
merge-recursiv
e
: rename MERGE_
R
ECUR
S
IVE_* to M
E
RG
E
_VAR
I
ANT_*
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
me
r
ge-recursive: split internal
fields int
o
a separate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
merge
-
recursive: avo
i
d
l
os
i
ng output and leaking
me
m
ory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
merg
e
-recu
r
sive
:
c
omment
a
n
d reorder th
e
merge_options
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah
N
ewr
e
n
merge-recurs
i
ve: consolidate
unnecessary fi
e
l
d
s in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recurs
i
v
e
: m
o
ve som
e
defini
t
ions
a
roun
d
to c
l
ean
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h N
e
wren
merg
e
-recursive: renam
e
merge
_
op
t
ions argume
n
t to opt
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
m
er
g
e-recursive: rename
'
m
r
tree' to 'result_tree',
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h New
r
e
n
merge-recursiv
e
: us
e
c
o
mmon name fo
r
a
n
ces
t
ors/common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newr
e
n
mer
g
e-recu
r
sive
:
fix s
o
m
e overly long l
i
nes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah New
r
e
n
ca
c
he
-
tree:
s
h
a
r
e
code between functions
wri
t
ing
a
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newre
n
merge-recursive: don
'
t forc
e
external callers to do
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive
:
rem
o
ve usele
s
s para
m
e
ter in
m
erg
e
_
t
r
e
e
s
(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive:
e
xit
earl
y
if index != head
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
ja
h
Newren
Ensu
r
e
i
n
de
x
m
atches head
b
efo
r
e invo
k
ing m
e
r
ge machine
r
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursiv
e
:
r
e
move another im
p
l
i
c
i
t
d
ependency
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
m
e
rge-rec
u
rsive: future-pr
o
of
u
pdate_fi
l
e_flags() against
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
m
e
rge-recursive: p
r
ovide
a
better l
a
bel for diff
3
common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Eli
j
ah Newren
merge-
r
ecursi
v
e: enforce opt->
a
nces
t
or != NULL w
h
en
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah New
r
e
n
checkout
:
provide bett
e
r conf
l
ict hunk
d
e
scription
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
merge-recur
s
ive: b
e
consis
t
ent with assert
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
E
l
i
j
a
h Newren
checkout:
remove dupl
i
cate code
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-12
E
lijah Ne
w
ren
git-fast-import
.
t
x
t
: cl
a
rif
y
that multip
l
e
m
erge commits
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
merge-recursive
:
a
void dir
e
ctory rename
d
e
tection in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-06-05
El
i
jah N
e
wren
merge-recur
s
ive: res
t
o
re acc
i
dentally drop
p
ed setti
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
El
i
ja
h
Newren
f
a
s
t-export: do au
t
omatic reencoding
o
f
commit
me
s
sages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Eli
j
ah Newren
fast-e
x
p
o
r
t
:
differentiate b
e
twee
n
explicit
l
y
U
T
F-8
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
El
i
jah New
r
en
fast
-
ex
p
ort: avoid
str
i
pping en
c
oding heade
r
if we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
El
i
j
a
h
Newr
e
n
fa
s
t-imp
o
r
t
: s
u
pport 'encoding
'
c
ommit h
e
a
der
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
El
i
jah Newren
t
9
350: fix encoding
t
est to actually test reen
c
oding
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-26
Elijah
N
ewren
Honor core
.
precompose
U
nico
d
e in more places
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah New
r
en
merge-recursive: switc
h
direc
t
ory r
e
name detection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
merge-recursive:
g
ive
ca
l
l
ers of ha
n
d
l
e
_co
n
tent_merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
merge-recursive:
track information associat
e
d
with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newre
n
t6043: fix c
o
pied test desc
r
i
p
tion to match its pur
p
ose
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
merge-recursi
v
e
:
switch fro
m
(oid,mo
d
e) pa
i
rs t
o
a
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
mer
g
e-recursive
:
cle
a
nup
h
a
n
dle_rename_* func
t
i
on signatures
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
merge-recursive: tr
a
ck
b
ra
n
ch where
r
ename occurred
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
merge-recursive: remove re
n
[12]
_
other fields fro
m
ren
a
me_con
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ija
h
Newren
m
e
rge-
r
ecursiv
e
: shri
n
k rename_conflict_in
f
o
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah New
r
en
merge-recursi
v
e: mov
e
s
ome struct declarati
o
ns together
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
merge
-
recu
r
s
i
ve: use 'ci' for rename_co
n
flict_info
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
merge-recursive: rena
m
e loc
a
l
s
'o' and 'a' to 'obuf
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merg
e
-recur
s
ive: rename diff_filespec '
o
ne'
to '
o
'
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-
r
ecurs
i
ve: rename mer
g
e_optio
n
s
argument from
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewre
n
Use 'unsigned short' for mode,
l
ike diff_filespec does
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
Newren
f
a
st-i
m
port: fix
e
rroneou
s
handling of
g
e
t-mark w
i
th
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elija
h
N
ewren
f
a
st-import
:
only allow cat-blob
req
u
es
t
s where it
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-imp
o
rt: c
h
eck most promi
n
ent c
o
mmand
s
fir
s
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah Newren
g
i
t-fast-
i
m
p
o
rt
.
txt: fix
w
ording about
w
here ls comm
a
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
t
9300
:
demonstrate b
u
g with get-mark and empty o
r
pha
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-21
E
lijah
N
e
w
r
en
m
erge-options
.
t
x
t: c
o
rrect word
i
ng of
-
-no-commit
o
ption
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-14
Elijah Newr
e
n
g
it-r
e
base
.
txt: updat
e
to reflect merge now im
p
lemented
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-08
Eli
j
ah New
r
en
log,di
f
f
-
tree: add --c
o
mbined-al
l
-paths opti
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-01-10
E
l
i
j
ah Newren
git-show-re
f
.
txt: fix
o
rder of fla
g
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-01-07
Elijah
Newre
n
rebase: imp
l
ement --
m
e
rge
v
ia the
interactive machi
n
ery
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
r
en
r
e
base: define lineari
z
a
t
ion
o
rder
i
ng and e
n
force it
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah New
r
en
git-lega
c
y
-rebase:
sim
p
lify
u
nnecessary
triply-nested if
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-reb
a
se, sequencer:
extend
--quiet op
t
ion fo
r
the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
El
i
ja
h
Newren
am, rebase--mer
g
e: do no
t
ov
e
r
l
ook
--skip'ed commit
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah New
r
en
t5407
:
add
a te
s
t de
m
o
n
st
r
ating how interactive handles
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
re
b
ase: fix incomp
a
ti
b
l
e
o
p
tions error message
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Newren
rebase: make bu
i
ltin and l
e
gacy s
c
ript erro
r
messages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-09
E
lijah Newren
git-rebase
.
txt: update no
t
e about directory renam
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
E
li
j
ah Newren
fast-export: add
a --show-ori
g
inal
-
i
d
s
o
p
tion to sh
o
w
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next