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
t3600: comment on inducing SIGPIPE in `git rm`
2019-11-02
Elijah Newre
n
RelNotes
/
2
.
24
.
0: f
i
x s
e
l
f
-contradictory note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elij
a
h
Newren
RelNotes/2
.
24
.
0: typof
i
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
t6
0
4[236]:
d
o not run setup in separ
a
te
t
e
sts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newre
n
me
r
ge-recursive:
fix mergin
g
a subdire
c
tory into th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
E
l
ijah Newren
merge-recursiv
e
: clean up g
e
t_renamed_
d
ir_portion()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
El
i
jah Newren
merge
-
rec
u
rsive: fix
the fix to th
e
diff3
c
ommon an
c
estor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah N
e
wre
n
fast
-
export: hand
l
e nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
t935
0
: add tests for tags o
f
things other
t
han
a
com
m
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newren
fa
s
t
-
ex
p
ort: allow user to reque
s
t tags
be marked
w
i
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
f
a
st
-
export: add support for --import
-
m
arks-if-exist
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newr
e
n
fast-import: add su
p
port for new 'alias' comm
a
nd
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h N
e
wren
fast-import: allow ta
g
s
t
o
be i
d
e
nt
i
f
i
ed
by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newren
f
ast-import: f
i
x
han
d
ling of deleted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
E
l
ijah Newr
e
n
mer
g
e-recu
r
sive: fi
x
th
e
diff3
com
m
on an
c
estor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah
Newren
dir:
spe
c
ial case check for
th
e
possibility that pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Eli
j
ah
N
ewren
fast-e
x
p
ort: fix e
x
port
i
ng a tag and nothing else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
c
l
ean: fix theo
r
etical pa
t
h cor
r
uption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
clean: rewrap
overl
y
long line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wre
n
clean: av
o
i
d rem
o
v
ing untracked
f
iles in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean:
d
i
sa
m
bi
g
uate the
d
ef
i
nition of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
git-clean
.
txt
:
do
n
ot cl
a
im we will dele
t
e fil
e
s w
i
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewren
d
ir:
add commentary ex
p
laining match_pat
h
spec_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
dir: if our paths
p
ec might
m
atch files
und
e
r
a di
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewren
dir: m
a
ke the DO_MA
T
CH_SUBMODULE code reusab
l
e for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wre
n
dir
:
a
l
so check directories for match
i
ng paths
p
ecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir:
f
ix
off-by-one
e
r
ror in ma
t
ch_paths
p
e
c
_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
ewre
n
dir
:
fix
t
ypo in
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
t
7
300: add testca
s
es s
h
owing failure to
cl
e
a
n
spe
c
ifie
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t9902: use a non-de
p
r
e
cated command for testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah New
r
e
n
R
e
commend git-filter-
r
epo instead
o
f gi
t
-filter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Eli
j
a
h Newren
t6006: simplify, fi
x
, a
n
d
optimize empty m
e
ssage t
e
st
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t342
7
: accele
r
ate this
test by using fast-export
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Eli
j
ah Newren
merge-optio
n
s
.
t
xt: c
l
arify meaning of various ff-r
e
lated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
merge-recu
r
sive: alphabet
i
ze include list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-
r
ecursive: add sanity
c
h
e
c
ks
f
or
re
l
evant merge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
m
e
rge-recursi
v
e
:
r
ename MER
G
E_RECURSIVE
_
*
to ME
R
GE_VARIA
N
T_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah
Newren
merge-recursive:
s
pl
i
t internal
f
ields
into a separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
r
ge-recursi
v
e:
avo
i
d los
i
ng out
p
ut and lea
k
ing memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah New
r
e
n
merge-recursiv
e
: comment and
reor
d
er the merge_op
t
i
ons
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newre
n
merge-r
e
cursive
:
conso
l
ida
t
e unnece
s
s
ar
y
fields in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah N
e
w
ren
merge-recursive:
move some
d
e
f
i
nitions ar
o
u
n
d to
c
le
a
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-
r
e
cu
r
sive: renam
e
me
r
ge_options argument to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
mer
g
e-recursive: rena
m
e 'mrtree' to 'result_tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: use
com
m
on
n
ame
f
or
a
nc
e
s
t
ors/common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah
N
ewre
n
merge-re
c
urs
i
ve: fix
s
ome overly lo
n
g lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah
N
ewren
cache-tree:
s
h
are code between fu
n
ctions
w
riting an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
me
r
ge-recursiv
e
: don't
f
o
r
ce external callers
t
o do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newr
e
n
mer
g
e-
r
e
cursive: remove
useless p
a
r
ameter in
m
erge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-r
e
cursive:
ex
i
t early i
f
i
ndex != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
Ensure
index
m
a
tches head before inv
o
king
m
e
rge mac
h
i
nery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
e
rge-recursive: remov
e
another imp
l
icit dependency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-
r
ecursive: futur
e
-proo
f
upda
t
e
_
f
ile_fl
a
gs() against
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-rec
u
rsive: pr
o
v
ide
a
b
e
t
t
er label
f
or diff3
c
ommon
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newre
n
merge-recu
r
siv
e
: enf
o
r
c
e opt->ancest
o
r != NULL when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elija
h
N
e
wren
checkou
t
: provi
d
e bett
e
r
conflic
t
hu
n
k
desc
r
iption
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
El
i
jah Newren
merge
-
recursive: b
e
consistent
w
i
th as
s
ert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elija
h
Newren
checkou
t
: rem
o
ve d
u
plicate cod
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Eli
j
a
h Newren
git-fast-imp
o
rt
.
txt
:
clarify th
a
t multiple
mer
g
e c
o
m
m
its
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Ne
w
ren
merge-recursiv
e
: avoid director
y
rename d
e
tection
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elij
a
h Newren
merge-recu
r
s
iv
e
: restore accidenta
l
ly dropped
s
etting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elija
h
Newren
fast-export:
do auto
m
at
i
c reencoding of commit messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah Newren
fast-e
x
port: dif
f
erentiate
b
etw
e
en
e
xplicitly UTF
-
8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah Ne
w
ren
fast-export: avoid
st
r
i
p
ping encoding h
e
a
d
er if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h Newre
n
fas
t
-
import: sup
p
ort 'enco
d
ing' co
m
mit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah New
r
en
t9350: fix
encod
i
ng
tes
t
to actua
l
l
y
test
r
eencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah New
r
en
Honor core
.
precomposeUni
c
od
e
in mor
e
places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-re
c
u
r
sive:
s
witch director
y
rename detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
me
r
ge-recursiv
e
: g
i
ve callers of ha
n
dle_content_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursive: track informat
i
on associated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah
New
r
en
t6043:
fix copied test description
to mat
c
h its purp
o
se
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
re
n
merge-recursive:
swi
t
ch from
(
oid,mode) pairs to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newren
merge-recursive: c
l
e
a
nup handle_rename
_
*
f
u
nction sign
a
tures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Ne
w
ren
merge-recursive: tr
a
ck branch w
h
ere rename occurre
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h
N
ewren
merge-r
e
cursive: rem
o
ve ren[12]_other fi
e
l
d
s from rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
m
erge-recursive: shrink rename_c
o
nf
l
ic
t
_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
jah Newren
merge-
r
e
c
u
r
sive: move some struct declara
t
ions together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah N
e
w
ren
merge-recursive:
use 'ci'
f
or rename_con
f
l
ict_info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newren
merge-recursive
:
rena
m
e
loc
a
l
s
'o' an
d
'a' to 'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newre
n
merge-recursive: ren
a
m
e
diff_filespec 'one' to 'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewren
m
e
rge
-
rec
u
rsive: rename merge
_
optio
n
s
argu
m
ent fro
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
U
s
e 'unsign
e
d s
h
ort'
for
mode, like diff
_
fi
l
e
s
pec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-import:
f
ix
erro
n
eo
u
s hand
l
ing of get-mark w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah N
e
wre
n
fas
t
-impor
t
: onl
y
allow cat-blob requ
e
sts where
it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h
N
ewre
n
f
a
st-import: check most pro
m
inent command
s
first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newren
git-fast-import
.
txt: fix wording abou
t
where ls
c
ommand
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
t9300: demonstra
t
e bug
w
i
th get-mark and
emp
t
y orphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elija
h
N
e
wre
n
merge-opti
o
ns
.
txt: correct word
i
ng of --no
-
commit option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elijah Newren
git-rebase
.
t
x
t
:
update to reflec
t
merge
n
ow impl
e
mented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Eli
j
ah Newren
log,diff-tree: add
-
-combined-all-paths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah New
r
en
git-show-ref
.
tx
t
: fix order of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
E
l
i
j
a
h New
r
en
rebas
e
: impl
e
men
t
--merge via
the
i
n
t
e
r
active
m
achinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h
New
r
en
re
b
ase
:
define linearization
orderi
n
g and enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
a
h
Newre
n
git-legac
y
-rebase
:
simplif
y
unnec
e
ssary tri
p
ly-
n
ested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
gi
t
-reb
a
se, sequencer: extend --quiet option for
t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
am, rebase--me
r
ge: do not overlook --skip
'
e
d
commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h Newren
t5407: a
d
d a test demonstrat
i
n
g
how inte
r
active handle
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
Newren
rebase: fix incompatibl
e
opti
o
ns
e
rror message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newre
n
rebase
:
make
b
uiltin a
n
d legacy
scr
i
pt error mess
a
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elij
a
h N
e
wre
n
git
-
reba
s
e
.
txt: update
not
e
ab
o
ut d
i
r
ectory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fa
s
t-ex
p
ort: add a --show-origin
a
l-ids
o
ption to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next