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
Merge branch 'jc/doc-single-h-is-for-help'
2020-02-27
Elijah
N
ewren
t6020:
new test with inte
r
l
eav
e
d le
x
icog
r
aphic
o
rdering
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah Newren
t6022
,
t6046: test expected beh
a
vior ins
t
ead of te
s
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
N
ewren
t3035: p
r
efer test_must_f
a
il t
o
bash
n
e
g
ation for git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah
N
ew
r
en
t
6020, t6022, t6035: update merge tests to use
t
est
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
El
i
jah Ne
w
ren
t602
[
1236]
,
t603
4
:
m
o
d
ern
i
ze t
e
st format
t
i
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-27
Elijah Newren
merge-recursi
v
e: apply collisi
o
n hand
l
ing unific
a
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-19
Elijah Newre
n
mer
g
e-recursive: fix the re
f
res
h
logic in updat
e
_file_flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-19
E
lijah New
r
e
n
t3433: new
r
ebase testc
a
se
d
ocumenting a stat-di
r
t
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-18
Elijah Newren
check
-
ignore:
f
i
x documentat
i
on and imp
l
ementatio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newre
n
r
ebas
e
: r
e
name the two primary re
b
ase backends
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
ewren
reba
s
e:
change t
h
e
defa
u
lt backend fro
m
"am"
to "m
e
r
g
e"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
r
e
b
a
s
e: m
a
ke the bac
k
end
configur
a
bl
e
via config s
e
tting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah New
r
en
re
b
ase tests: repeat some
tests using the
m
e
rge backend
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
E
lijah Newren
rebase tests:
mark
t
e
s
ts
s
p
ec
i
fic to
t
he am-backend
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah New
r
e
n
re
b
ase: drop '-i' from the reflog for interacti
v
e-based
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
E
l
ijah Newren
git-
p
rom
p
t: c
h
ange the prompt for
interactive
-
b
ased
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
El
i
ja
h
New
r
en
rebase: add an --am option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
E
l
ijah Newren
rebase: mov
e
incomp
a
tibilit
y
checks b
e
tween
b
a
c
ke
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
gi
t
-
r
e
bas
e
.
txt: ad
d
mo
r
e
d
e
t
a
ils about behavio
r
al differe
n
ce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah N
e
wren
reb
a
se: allow
m
o
r
e
types of reb
a
ses to
f
as
t
-forw
a
rd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah N
e
wr
e
n
t3432
:
make the
s
e tests work
with either am
o
r merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
r
e
ba
s
e
:
fix
handlin
g
of
r
e
s
t
ri
c
t
_
r
e
vision
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newre
n
re
b
ase:
m
a
k
e
s
u
r
e to
p
ass along the q
u
iet flag to the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elij
a
h Newren
rebase, sequencer:
re
m
ove the br
o
ken GIT_
Q
UIET handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah N
e
wren
t3406:
s
implify a
n
a
l
ready simpl
e
tes
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
E
lijah Newren
rebase
(
interactive-back
e
n
d
)
:
fix ha
n
dling of commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah N
e
wr
e
n
reb
a
se
(inte
r
act
i
ve-bac
k
end): make --keep-empty
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-17
Elijah Newren
t3404
:
directly test
t
he behavior of inter
e
st
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-17
E
l
ij
a
h Newren
git-rebase
.
t
xt: update descript
i
on of
--allo
w
-empty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-16
E
l
ijah
Newren
dir
:
treat_leading_path(
)
and
r
e
a
d_direct
o
ry_recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-07
Elijah Newren
string-list:
n
ote in do
c
s
t
hat ca
l
l
ers c
a
n specif
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-07
E
lij
a
h
N
e
wren
unpac
k
-trees: ex
i
t
ch
e
c
k_up
d
ates() early if updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-02
Elijah Newren
merge-recursive: r
e
m
o
ve
unnecessar
y
o
id
_
eq function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-20
Elijah N
e
wren
rebase: fix
s
aving of --signoff state
f
or am-b
a
sed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah N
e
wr
e
n
dir: con
s
olidate si
m
ilar code i
n
treat_direct
o
ry(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
dir: sync
h
ronize treat_
l
eading_path() an
d
read_
d
irectory_rec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elij
a
h
Newren
dir
:
fix checks
o
n co
m
mon prefix directory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-18
Elijah N
e
wren
t3434: mark successfu
l
test a
s
such
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
dir: break pa
r
t of read_directo
r
y_recursive() out
fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
E
l
ija
h
Newren
dir:
e
xit
b
efore wild
c
ard fall-through
i
f the
r
e is
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah
Newren
dir:
remo
v
e stray qu
o
te character in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
Revert "dir
.
c: mak
e
'git-status --ignored' work within
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
t3011: d
e
monstrat
e
directory trav
e
rsal
fai
l
ures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spell
i
ng errors in no-longer-upda
t
ed-from-upstream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
El
i
jah Ne
w
ren
mu
l
timail: fix a few simple
spelling
e
rro
r
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
E
l
ijah Newre
n
s
h
a1dc: f
i
x
trivial comment spelli
n
g error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spel
l
ing errors
i
n
t
e
s
t comm
a
nds
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Eli
j
ah Newren
Fix spelling errors in messag
e
s show
n
t
o
users
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Eli
j
ah Newren
Fix spe
l
ling errors
i
n names
of tests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Eli
j
ah Newren
Fix
s
p
e
lli
n
g
error
s
in c
o
mments of t
e
s
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spelli
n
g errors in code
c
omment
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah
N
e
w
r
e
n
t6024
:
modernize
style
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Eli
j
ah Newren
name-
h
ash
.
c: remove duplica
t
e word in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ijah Newren
hashmap
:
fix do
c
umentation misus
e
s of -
>
versus
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elija
h
Newren
gi
t
-
filter-bra
n
ch
.
txt: corr
e
ct argume
n
t name typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah
N
ewren
F
i
x
sp
e
lling errors in d
o
cumentation
out
s
ide of Do
c
umenta
t
ion/
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Ne
w
ren
Documentation: fix a bunch of typo
s
, both
old and n
e
w
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Eli
j
a
h
N
e
wren
RelN
o
tes/2
.
24
.
0
:
f
i
x
self
-
contradi
c
t
o
r
y
not
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah N
e
wren
RelN
o
tes/2
.
2
4
.
0
:
typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
El
i
jah Newr
e
n
t
6
04[236
]
:
d
o
not
r
un setup in separate
t
est
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
E
l
ijah Newren
merge-rec
u
rs
i
ve: fix mergi
n
g a
s
u
b
dir
e
ctory into the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
merge-
r
ecursive: cle
a
n up
get_rename
d
_di
r
_porti
o
n
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newren
merg
e
-recu
r
sive: fix the fix to the diff3 common anc
e
stor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah Newren
fas
t
-
e
xport: han
d
le nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah Newren
t9350: add tests f
o
r tags of t
h
ings other
t
h
an a
c
o
mmit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast
-
ex
p
ort: allow user to req
u
est tags be marked with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newren
f
ast-expo
r
t: add su
p
port for --imp
o
rt-mark
s
-
i
f-exi
s
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Ne
w
ren
f
a
st-import: a
d
d support f
o
r new
'
alias'
c
om
m
and
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
Newren
fast-import: allow ta
g
s to
be
identifi
e
d by mark l
a
bels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
i
j
ah Newren
fa
s
t-import:
f
ix
h
andling o
f
deleted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
m
e
rge-recur
s
ive: fix the diff3 com
m
on
ancestor l
a
b
el
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
E
lijah Newren
dir: s
p
ec
i
al case check for the p
o
ssibility that pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah New
r
en
f
a
st-export
:
fix
ex
p
orti
n
g a tag and nothi
n
g
else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newre
n
clean: fi
x
theoreti
c
al pat
h
corruption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
New
r
en
clea
n
:
r
ewrap overly long line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: avoid r
e
moving untr
a
c
ked files in a n
e
sted git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ij
a
h Ne
w
ren
clea
n
: disamb
i
guate the defin
i
ti
o
n of -
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
gi
t
-clean
.
txt: do no
t
claim we will delete files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah
Newren
dir: add comme
n
tary explaining match_pathspe
c
_
i
tem
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
e
wren
dir: if our
p
athspe
c
m
i
g
h
t m
a
tch files und
e
r a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newren
dir: m
a
ke
the DO_M
A
TCH_SUBMODULE
c
o
de reus
a
ble fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
d
i
r: a
l
s
o
check directori
e
s for match
i
ng pathsp
e
cs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
i
j
ah
Newr
e
n
dir: fix off-by-one er
r
or in
match
_
paths
p
e
c
_
item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewren
dir: fix
typo i
n
co
m
me
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
t73
0
0: add testcases showing
f
ailu
r
e to
c
lean sp
e
c
i
fied
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elij
a
h Newren
t99
0
2:
use a non-depreca
t
ed
command for t
e
s
ting
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah N
e
wren
Re
c
ommend git-filte
r
-repo instead of git-filter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t6006
:
simplif
y
,
fix, and opti
m
ize
e
mpty message test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newr
e
n
t34
2
7: accelerate t
h
is test by
u
sin
g
fast-expor
t
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Newren
merge-options
.
txt:
clari
f
y meaning
of various
ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
merge-recursive: alpha
b
etize i
n
c
lude li
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
merge-re
c
ursive:
a
dd sanity checks fo
r
rel
e
v
a
n
t
m
e
rge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
m
e
r
g
e
-
recursive:
r
ename MERGE_RECURSIVE_*
t
o
MERGE_VARIANT
_
*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
a
h
New
r
en
merge
-
r
e
cursive: split interna
l
fields
i
nto
a sep
a
rate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-recurs
i
ve: av
o
i
d
losi
n
g
ou
t
put and leaking memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
New
r
en
merge-recursive:
c
omment and reorder th
e
merge_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
m
er
g
e-recursive:
c
o
n
so
l
i
d
ate unnece
s
sary
fiel
d
s
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
me
r
g
e-re
c
ursive: m
o
ve some defini
t
i
ons around to clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive:
r
e
name m
e
rge_option
s
arg
u
ment
t
o opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h
N
e
w
r
en
merg
e
-recursiv
e
: rena
m
e 'mrt
r
ee' to 'result_tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next