repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fast-rebase: demonstrate merge-ort's API via new test-tool command
2020-02-16
Elij
a
h
N
ewren
rebase: m
o
ve incompatib
i
lity checks between ba
c
kend
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
Newren
git-reba
s
e
.
tx
t
:
a
dd
m
ore
d
etails
about behavioral di
f
f
e
r
ence
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah Newr
e
n
rebase: allo
w
m
or
e
types of r
e
b
a
s
e
s to fast-
f
orward
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
t3432
:
make these tests work
w
i
th eit
h
er
am o
r
merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
El
i
ja
h
Newren
rebase: f
i
x h
a
ndling
o
f
r
estrict_
r
evisi
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
e
wren
rebase: make sure to pass along the quiet
f
lag
to
t
he
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
re
b
ase, sequencer: remove th
e
b
r
o
ken GI
T
_QUIE
T
handl
i
ng
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
t3406: si
m
plif
y
an already simple te
s
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
E
l
ijah Newre
n
rebase (
i
nteractive-backend): fix handli
n
g of commit
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
El
i
jah Newren
rebase (interactive-ba
c
k
e
n
d
): make --keep
-
empty
t
h
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-17
El
i
jah Ne
w
ren
t3404: directly t
e
st
the
b
ehavior of in
t
erest
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-17
Elijah Newren
git-rebas
e
.
txt:
u
pd
a
te descri
p
tion o
f
-
-al
l
ow-em
p
t
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-16
E
lijah Newren
dir: tr
e
at
_
le
a
din
g
_path() and read
_
dir
e
ctory_rec
u
rsive
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-07
E
l
i
jah Newren
string-list: not
e
in docs
t
h
at
c
a
l
lers
can specify
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-07
Elijah Newren
unpa
c
k-trees
:
e
xit
che
c
k_updates(
)
early if updates
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-02
Elijah Newren
m
erge
-
recursive: remove unnecessary o
i
d_eq function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-20
Elijah New
r
en
r
e
b
a
s
e: f
i
x saving of --signoff state for am-b
a
sed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
d
ir: co
n
s
o
lid
a
te si
m
ilar cod
e
in treat_d
i
rect
o
r
y
()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
E
l
ija
h
Ne
w
ren
d
i
r:
s
ynchronize treat_
l
eading_
p
ath() and rea
d
_d
i
r
e
ctory_rec
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Ne
w
ren
dir: fix checks o
n
com
m
o
n
prefix directory
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-18
Elij
a
h Newren
t
3
434: mark successful test as su
c
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Ne
w
ren
dir: break part of read_
d
irectory_recursi
v
e(
)
ou
t
for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
E
l
ijah Newren
di
r
: exit before wildcard
f
all-through
i
f
there i
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
E
lijah Newren
di
r
: remove
s
tr
a
y quo
t
e characte
r
in comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
Revert
"
dir
.
c
: make 'gi
t
-stat
u
s --ignor
e
d' work within
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah N
e
w
r
en
t3011
:
demonstrate directory traversal failures
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
F
ix sp
e
l
ling e
r
ror
s
in
no-lo
n
ger-updated-
f
ro
m
-upstream
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah N
e
wren
multim
a
i
l: fix a few
s
imple
s
pelling error
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
E
l
ijah Newren
sha1dc: fix trivial comment
s
pellin
g
error
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spelling errors in test comman
d
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newr
e
n
Fix spel
l
ing
e
rrors in mes
s
age
s
s
h
o
w
n to
u
s
e
rs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newr
e
n
Fix s
p
elling err
o
rs in names of tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
E
lij
a
h Newren
Fix spellin
g
errors in
comme
n
ts o
f
test
c
ases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elij
a
h
Newren
Fi
x
spellin
g
errors
i
n code comm
e
nts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
El
i
j
a
h Ne
w
re
n
t6024
:
modernize s
t
y
l
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
n
a
me-h
a
sh
.
c: rem
o
ve duplica
t
e word in comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Ne
w
ren
hashmap:
fix d
o
cument
a
tion misuses of -> versus
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
g
it
-
filter
-
branch
.
t
x
t: correct argument name typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
E
l
i
j
a
h
Newr
e
n
Fix spelling errors in docu
m
entation outside of
D
ocumentati
o
n/
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah
Newren
Documentation: fix a b
u
nch
o
f typ
o
s
,
both old and new
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
El
i
j
a
h Newren
RelN
o
tes/2
.
24
.
0
:
fix
self-cont
r
adicto
r
y
note
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
RelNote
s
/2
.
24
.
0: typofix
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
t
6
04[236]: do not r
u
n setup in separate tests
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Elijah
Newren
merge-recu
r
sive: fix
m
e
rging
a
s
u
bdi
r
ec
t
ory into the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
m
erge-recu
r
s
i
ve: clean up get_rename
d
_dir_porti
o
n()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newren
merge
-
r
e
cursive: fix the
f
ix to
the diff3 com
m
o
n ancestor
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah Newren
fast-expor
t
: handle nested tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
El
i
ja
h
Newr
e
n
t9350: add test
s
for tags of t
h
ings o
t
her than a co
m
mit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
en
fast-e
x
port: allow user to
request tags be m
a
rked with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah
N
ewr
e
n
fast-export: add s
u
pport
f
or
--import-
m
arks-if-exi
s
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
N
ewren
f
a
st-import:
add support for new 'alias' com
m
and
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah N
e
w
ren
fast-import: allow tags
t
o be ident
i
fied by
mark labels
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
a
h Newre
n
fast-
i
mport:
f
i
x handling of del
e
ted t
a
gs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Eli
j
ah Newren
merge-recur
s
ive: fix the d
i
ff3 common an
c
est
o
r label
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
E
l
ijah Newren
dir: special
c
a
se
c
he
c
k
for the p
o
ssibility that pat
h
s
pec
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-28
E
lijah New
r
en
f
a
s
t
-expo
r
t:
fix exporting a tag and
nothing else
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
w
ren
clea
n
:
fix theoretical
pat
h
corruption
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
El
i
j
ah
N
ewre
n
cl
e
an: r
e
wrap overly long line
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ew
r
en
clean:
avoid
r
em
o
ving untracked files in a nested git
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
clean:
d
i
sam
b
iguate the de
f
inition of -d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
N
e
wren
git-
c
lean
.
txt: d
o
not claim w
e
w
i
ll
delet
e
files with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewren
di
r
:
add commenta
r
y e
x
pla
i
nin
g
m
a
t
ch_pathspec_item
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir:
i
f 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
l
ij
a
h Newren
dir:
m
ake
t
he
DO_MATCH
_
SUBMODU
L
E code
r
eusable for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newre
n
dir: al
s
o che
c
k dire
c
tories for ma
t
ching paths
p
ec
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
e
n
dir:
f
i
x o
f
f-by-one
e
r
ror i
n
match_paths
p
ec
_
i
tem
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
di
r
: fix
typo in c
o
mment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7300: add testcases showin
g
f
ailure to clean specified
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah N
e
wr
e
n
t9902: use a non-d
e
precated command fo
r
testing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
Re
c
ommen
d
g
i
t
-filter
-
repo
instea
d
o
f g
i
t
-
filte
r
-branch
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah
N
e
w
ren
t600
6
: simp
l
ify, fix, and
o
p
t
imize empty
m
essage t
e
s
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah New
r
en
t34
2
7: accelerate
this test by us
i
ng f
a
st-
e
x
p
ort and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Newren
merge-options
.
txt: clarify mea
n
ing of
v
ari
o
us ff
-
related
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h
Newren
m
e
rge-r
e
cursive:
a
lphabetiz
e
include
l
ist
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
r
g
e-recur
s
ive: add s
a
nity chec
k
s fo
r
re
l
ev
a
nt
m
e
rge_opt
i
ons
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
mer
g
e-recursive: rename MER
G
E_RECURSIVE
_
* to MERGE_VARIANT_*
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h
Newren
merge-recursive: spl
i
t int
e
rn
a
l
fields
int
o
a separate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-recursive: avoid losing ou
t
put an
d
leaking memory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lij
a
h Newr
e
n
m
erge-recursive: c
o
mment and re
o
rder the m
e
rge
_
opt
i
ons
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-
r
e
c
u
r
sive: co
n
solida
t
e unnecessary fields in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-re
c
ursive: move some definitions
a
round to c
l
ea
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
m
erge-recursive: rename mer
g
e_option
s
a
r
gument to op
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
a
h Ne
w
ren
m
e
rg
e
-recursive: rena
m
e 'm
r
t
r
ee
'
to 'result_t
r
ee
'
,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
New
r
en
merge-recur
s
ive
:
us
e
common name for ancestors/comm
o
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
er
g
e
-
recursive: fix some
overly long lines
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
cache-
t
ree: share code betwe
e
n
f
unctions w
r
iting an
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
m
e
r
g
e
-re
c
ursive:
don't force e
x
ternal callers to do
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newr
e
n
me
r
g
e-
r
ecursive: remo
v
e useless
par
a
meter in merge_trees()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h
Newr
e
n
merge-recursive
:
exi
t
e
arly if
i
ndex != h
e
ad
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah New
r
e
n
Ensure ind
e
x matches head before
invokin
g
m
erge machinery
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
m
e
rge-recurs
i
ve: rem
o
ve another implic
i
t dependency
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
m
e
r
ge-recursiv
e
: future-proof up
d
ate_file_flags()
a
gainst
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newr
e
n
m
e
rge-recursive: provide a better
l
a
bel for diff3 common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah N
e
w
ren
merge-recursive:
enforc
e
opt
-
>ances
t
or !=
N
ULL
w
hen
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elija
h
Ne
w
ren
che
c
kout: provide better co
n
fl
i
ct
h
unk description
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
me
r
ge-r
e
c
u
rsive: b
e
consist
e
nt with
a
ssert
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
checkout: re
m
ove du
p
licate
co
d
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-12
Elijah Newren
git-fa
s
t-import
.
t
x
t:
clari
f
y that
multiple merge
commits
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-06
E
l
ij
a
h N
e
wren
mer
g
e-
r
ecursi
v
e: a
v
oid
d
irectory rename detection in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-06-05
E
l
ijah Newren
merge-recursive
:
r
estore accide
n
t
a
lly dropped
setting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next