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
rebase: make the backend configurable via config setting
2020-02-16
Elijah Ne
w
ren
rebase: make the backend configurable via config sett
i
ng
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah New
r
en
rebase
t
e
s
ts:
r
epeat some test
s
using
t
he merg
e
backend
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elij
a
h
N
ewren
r
ebase te
s
ts: mar
k
te
s
ts s
p
e
cifi
c
to the am
-
backend
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
e
wren
rebase: drop '-
i
'
from t
h
e reflog for intera
c
tive-ba
s
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah N
e
wren
git-prompt: change
the p
r
ompt for
i
nteracti
v
e-bas
e
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newr
e
n
r
e
base: add an --am option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elij
a
h Newren
rebas
e
: mo
v
e
incompatibility checks between
ba
c
kend
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
ewre
n
gi
t
-
r
eba
s
e
.
txt:
ad
d
more
det
a
ils ab
o
u
t
behavi
o
ral difference
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: allow
more types
of rebases to fa
s
t
-forward
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
t3432: make these tests wor
k
with either am o
r
merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
El
i
jah Newr
e
n
rebase: f
i
x hand
l
ing
o
f
restrict_revision
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: m
a
ke s
u
re t
o
pass along the quiet flag to the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase,
s
equen
c
er: rem
o
v
e
the br
o
ken GIT_QU
I
E
T handling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah Newren
t3406: si
m
p
l
ify an already simple test
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elija
h
Ne
w
ren
r
e
b
ase (interactive-backend)
:
f
ix handling of commits
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
a
h Newre
n
rebas
e
(interactive-back
e
nd
)
: make --keep-empty the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-17
Elijah
N
ewren
t3404: directly
test t
h
e behavio
r
o
f
interest
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-17
Eli
j
a
h
Newren
git-rebase
.
txt: update desc
r
iption of --allow-empty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-02
Elijah Newren
merge-recursive: remove un
n
ecessary oid_eq fu
n
c
tion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-20
Elijah Newren
rebase: f
i
x
saving of --signoff state
for
a
m-
b
ased
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
E
lij
a
h New
r
e
n
dir:
consolid
a
te similar code in tr
e
a
t
_direct
o
r
y
()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
dir: synchronize treat_leading_path() and read_direct
o
ry_re
c
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
E
l
ijah Newren
dir: fix
c
h
e
c
ks
on co
m
mon
prefix directory
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-18
Elij
a
h Newren
t3
4
34:
m
ark successful test as su
c
h
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
dir: break part
of read_directory_recursive() o
u
t
f
or
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
dir: exit b
e
fore wildcard fall-
t
hrou
g
h if t
h
ere is
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elij
a
h Newren
dir:
re
m
ove stra
y
quote characte
r
in
comm
e
nt
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Eli
j
ah Newren
R
e
vert "dir
.
c: make 'git-status --ignore
d
' wo
r
k
within
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Eli
j
ah Newr
e
n
t3011: demon
s
trate directory traversal failures
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Eli
j
ah New
r
en
F
ix spelli
n
g errors
in
no-
l
onger-updated-from-upstream
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
multim
a
il:
fix a few simp
l
e
spelling erro
r
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
sha1dc: fix trivial com
m
e
nt spell
i
ng error
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix
s
pelling
errors in test commands
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elij
a
h New
r
en
Fi
x
spelling error
s
i
n
m
essag
e
s s
h
own to users
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elija
h
Newren
F
ix spelling errors in
n
ames of te
s
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Ne
w
ren
Fix
spelling errors
in
comments o
f
testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Eli
j
ah Newr
e
n
Fix spelling errors
in co
d
e
c
o
m
ments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
t6024: mo
d
ernize
s
tyle
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah N
e
wren
name-hash
.
c: remove du
p
licate w
o
r
d
i
n
comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
hashmap: fix documen
t
atio
n
misuses of
-
>
v
ers
u
s
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
git-
f
ilter-branch
.
txt:
corr
e
ct argu
m
ent name t
y
po
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
E
lijah Newren
Fix spelling
errors in
docu
m
entation outside
o
f Documentat
i
on/
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ijah
N
ewr
e
n
D
ocume
n
tation: fix a
b
unch of typ
o
s, bot
h
old and ne
w
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
Eli
j
ah
N
e
w
r
e
n
R
elNotes/
2
.
24
.
0:
fix self
-
contradi
c
tory note
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newre
n
RelNot
e
s/2
.
24
.
0:
t
ypofix
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
t6
0
4[236]:
d
o
not ru
n
se
t
up in separate
t
e
s
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Elijah
N
e
w
r
en
merg
e
-re
c
ursive: f
i
x merging
a
s
ubdirecto
r
y
int
o
t
h
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Ne
w
ren
merge
-
recur
s
ive: clean u
p
get_r
e
n
a
med_dir_portion()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-08
Elijah
Newren
m
e
rge-recursive:
fix the fix to the diff3 common ance
s
tor
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah
N
ewren
fast-export
:
handle nes
t
ed tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
en
t93
5
0: add tests for tags of t
h
ings ot
h
er tha
n
a com
m
it
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
E
l
i
j
a
h Ne
w
ren
fast-expor
t
: all
o
w user to reques
t
tags
b
e
m
arke
d
with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-
e
xpor
t
: add
s
upport for --impo
r
t-marks-if-ex
i
s
ts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah
Newren
fast-import: add support for new
'alias' comma
n
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
El
i
j
a
h Newren
fast-import
:
a
llow
t
ags to be ide
n
t
i
fied by m
a
rk
l
a
bels
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
El
i
jah
N
ewren
fast-import
:
fix ha
n
dling of dele
t
e
d
t
a
g
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
m
erge-recursiv
e
:
f
i
x
the diff3
comm
o
n
a
ncest
o
r label
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
dir
:
special c
a
s
e check for t
h
e
possibi
l
ity that pathspec
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-28
Elijah New
r
en
fast-export:
fi
x
ex
p
o
rting a t
a
g and nothing el
s
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
El
i
ja
h
Newren
clea
n
: fix t
h
eoreti
c
al
p
at
h
corrupt
i
on
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean:
rewra
p
overly long line
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newr
e
n
clean:
avoid re
m
oving untra
c
ked files in a nes
t
ed git
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
r
e
n
c
lean: disamb
i
guate th
e
d
e
finition
o
f -d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewren
git
-
cl
e
an
.
txt: d
o
not claim we
w
i
ll dele
t
e files wi
t
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
ir: add co
m
m
enta
r
y ex
p
laining match_path
s
pe
c
_item
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir: if
o
ur pathsp
e
c
mig
h
t matc
h
files under a dir
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newre
n
dir:
make
t
he DO_MATCH_SUB
M
O
DULE
code
re
u
sable f
o
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: al
s
o
c
heck directories for matching
path
s
pecs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: fix off-b
y
-o
n
e
error in m
a
t
c
h_pat
h
spec_item
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
dir:
f
ix t
y
po
i
n
comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newren
t73
0
0: add t
e
s
t
cases showing failure to
cle
a
n spec
i
fied
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah Newren
t990
2
:
u
se
a
non-depr
e
cated c
o
mmand for
t
esting
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah
New
r
en
Recommend
git-filte
r
-repo inst
e
ad of git-filter-branch
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah N
e
w
r
e
n
t600
6
:
s
i
mplify,
fix, and
op
t
imize
e
mpt
y
message te
s
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah Newren
t3427
:
accelerat
e
th
i
s test by using fast-export and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-01
E
l
ijah Newren
m
erge-o
p
tions
.
txt: clarify meani
n
g
of various ff-r
e
lated
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
me
r
g
e
-recurs
i
ve: alphabetize include list
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
w
ren
me
r
ge-
r
ecursive:
a
dd s
a
nity c
h
e
c
ks for re
l
eva
n
t m
e
rge_options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
merge-r
e
c
u
r
sive
:
rename MERGE_RE
C
URSI
V
E_* to M
E
R
GE_VARIANT
_
*
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah
N
ewren
me
r
ge-r
e
cursive
:
spl
i
t i
n
ter
n
al
f
ields into a separate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merge
-
recursive: avoid lo
s
ing outpu
t
and lea
k
ing
memory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
mer
g
e-
r
e
cursive: comm
e
nt
a
nd
r
eor
d
er the
merg
e
_opt
i
o
ns
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
merge-
r
ecursiv
e
: c
o
ns
o
lidate unnecessary fi
e
lds in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
mer
g
e
-recur
s
ive: move so
m
e definition
s
around to clean
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursiv
e
:
r
e
name merge_
o
ptions
ar
g
u
ment to opt
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
j
ah Newren
m
erg
e
-recursive: rename 'mrtr
e
e' to 'resul
t
_tree',
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-
r
ecurs
i
ve: use c
o
mmon name fo
r
ancestors/common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
li
j
ah Newren
m
erge-recursive: fix
some ov
e
rly long lin
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newr
e
n
cache-tree: sh
a
re co
d
e
between
f
unc
t
ions writing
a
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewr
e
n
merge-rec
u
rsiv
e
:
d
on't force exte
r
n
a
l cal
l
ers to do
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newr
e
n
merg
e
-recursi
v
e:
r
emove u
s
ele
s
s p
a
ra
m
et
e
r in me
r
ge
_
t
r
ees()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
me
r
ge-recursive: exi
t
early if index != head
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
Ensure
i
ndex matches he
a
d before
invoking
m
erge
machinery
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge
-
r
e
cursive: remove another implicit
dep
e
nde
n
c
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
m
e
rge-rec
u
rsive: f
u
ture-proof update_fil
e
_flags(
)
agai
n
st
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-recursive: pro
v
ide a be
t
t
e
r l
a
bel for
diff3
common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah New
r
en
merge-re
c
ursive: enforce opt->ancest
o
r != NULL when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newr
e
n
checkout:
provid
e
b
etter co
n
flict hun
k
des
c
ription
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newren
merg
e
-
r
ecurs
i
ve:
b
e
consistent with a
s
sert
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newr
e
n
checkou
t
: r
e
move duplicate cod
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next