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
l10n: minor case fix in 'git branch' '--unset-upstream' description
2019-11-02
E
l
i
jah New
r
en
RelNotes
/
2
.
2
4
.
0:
fix
self-contr
a
dictory n
o
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah N
e
wren
RelNote
s
/2
.
24
.
0: t
y
pofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newren
m
e
r
ge-recursive: fix
the fix to the diff3 co
m
mon ancesto
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
i
j
ah Newren
fast-ex
p
ort: handle nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
en
t9350: add tests for
t
ags of things
other th
a
n
a
commi
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast
-
e
xp
o
rt: allow user to request tags be marked
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
jah Newre
n
fast
-
export:
add supp
o
r
t for --
i
mpo
r
t
-
marks-if-exists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newren
f
a
st-impor
t
: add supp
o
rt for new 'alias' command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newr
e
n
fast-import: a
l
low tag
s
to
be identified by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Ne
w
ren
fast-im
p
ort:
fi
x
handling of deleted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
m
e
rge-
r
ecursive: fix the
d
iff3 commo
n
ancest
o
r
l
a
bel
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
dir: special case check
for the possibilit
y
that path
s
pec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newren
fast-export: fix exporting a tag and n
o
th
i
ng else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
cl
e
an: fix theoretical
path corruptio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h N
e
w
r
e
n
clean: re
w
rap ove
r
ly
l
ong line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
cle
a
n: avoid
removin
g
untracked fil
e
s in a nested
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h
Newren
clean: disambiguate the defi
n
ition of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah N
e
w
ren
git-clean
.
txt:
do not
c
lai
m
w
e will delet
e
files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
dir: add comment
a
r
y
expla
i
ning mat
c
h
_
paths
p
ec
_
item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir
:
if our pa
t
h
s
p
e
c might
mat
c
h
file
s
under a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
dir: make
the DO_M
A
TCH_SUBM
O
DULE code reusa
b
le for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: also
c
he
c
k direc
t
ories for matching pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir
:
f
ix off-by
-
one er
r
or in
m
a
tch_
p
a
t
hs
p
ec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah Newren
d
i
r: fix typo
in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7300:
a
d
d
testc
a
ses showing fail
u
re to clean sp
e
cified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah
Newren
t
9
902: u
s
e a non-de
p
recate
d
command fo
r
testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah
Newren
Recommend g
i
t
-filter-repo instead of git-filter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah New
r
en
t60
0
6: simplify, fix, a
n
d optimize empt
y
mess
a
ge test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Ne
w
ren
t
3
42
7
: accelerate this
t
est by using
f
ast-export and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elijah Newren
me
r
ge-option
s
.
tx
t
: cla
r
ify meaning
of v
a
rious ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: a
l
phabetize
include list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah N
e
wren
mer
g
e-re
c
u
r
s
ive: add sanity checks for relevant me
r
ge_opti
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge
-
r
ecurs
i
ve
:
rename MERGE
_
R
E
CU
R
SIV
E
_* to MERGE_
V
ARIANT
_
*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recur
s
ive: spl
i
t
internal field
s
i
n
to a separat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah
N
ewren
merge-recursive: avoid losing output
a
nd
l
eakin
g
memory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
a
h Newren
merge-recursive: comment and reorder the merg
e
_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: consolidat
e
un
n
ecess
a
ry fiel
d
s in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newre
n
mer
g
e
-
recursive: move s
o
me defini
t
ions around to c
l
ean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lij
a
h Newren
me
r
g
e-recurs
i
ve:
rename mer
g
e_option
s
arg
u
m
ent to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
N
e
wren
merge-recu
r
sive: re
n
ame
'
m
r
tree' to 'result_tree'
,
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
rge-recu
r
sive: use common na
m
e
for ancestors
/
common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ija
h
Newre
n
m
e
rge
-
r
e
cursiv
e
:
fix some overly long lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
cac
h
e-tree: share
c
o
d
e betwee
n
fu
n
c
t
ions writing
a
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah N
e
wren
mer
g
e-recursive: d
o
n't force external callers to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
ah Newren
merge-recursive: r
e
move us
e
l
e
ss par
a
meter i
n
merge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ija
h
Newren
merge-recu
r
sive: e
x
it
early if in
d
ex != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
En
s
ure
i
ndex match
e
s he
a
d bef
o
r
e
invoking merge m
a
chinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-recursive: remove a
n
other implicit depen
d
ency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
mer
g
e
-
r
e
cursi
v
e: fut
u
re-
p
roof upd
a
t
e
_file_flags() a
g
ains
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
merge-recu
r
sive:
p
rovide
a
better label f
o
r
diff
3
commo
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
i
j
ah New
r
en
me
r
g
e-recu
r
sive: enforce opt->ancestor !
=
NULL w
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newren
checkout:
pr
o
vid
e
bett
e
r c
o
nflic
t
h
un
k
description
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
merge-r
e
cursive: be consistent with a
s
ser
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
lij
a
h Newren
checkout: remove duplicat
e
code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah
N
ewren
g
it-fast-import
.
txt: clarif
y
that multiple merge commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Newren
merg
e
-r
e
cursive: avoid dir
e
ctory re
n
a
m
e
d
etection in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Elijah Newren
merge-rec
u
rsive: resto
r
e ac
c
id
e
ntal
l
y d
r
o
pped setting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-exp
o
r
t: do automatic
reencodin
g
of commit messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fas
t
-ex
p
ort:
differentiate between expl
i
ci
t
ly UTF-
8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ija
h
Newren
fast-exp
o
rt:
avoid
str
i
pping encoding header
i
f we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newre
n
fast
-
import:
support 'encoding' c
o
m
m
it header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Ne
w
re
n
t9350: fix enc
o
ding
t
est to actually
test reencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah Newren
H
o
nor core
.
precomposeU
n
i
code in more place
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
merge-recursive: swit
c
h
d
irec
t
ory rename detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
m
erge-r
e
cursive: give callers of handle_content_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
merge-rec
u
rsiv
e
: track information as
s
ociated w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
t604
3
: fix
c
opied tes
t
des
c
ription to match its
p
urpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
mer
g
e-recursi
v
e: switch fr
o
m
(
oid,mode) pa
i
rs to
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merg
e
-recursive: cleanup hand
l
e_re
n
ame_* f
u
nction signatures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newr
e
n
merge-recursiv
e
:
t
rack branch wh
e
re rename oc
c
u
rred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
mer
g
e-recursive: remove ren[12]_other fiel
d
s from rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Ne
w
r
e
n
merge-recursi
v
e
:
shrink
rename_conflic
t
_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
me
r
ge-
r
ecursi
v
e:
m
ov
e
s
o
me struct declaration
s
t
o
gether
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
j
a
h Newren
me
r
ge-recursi
v
e:
u
s
e
'ci' for ren
a
me_confl
i
ct_info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
merge-r
e
curs
i
ve: r
e
name l
o
cals 'o' and 'a'
t
o
'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
m
e
rge-recursive: rename diff_filespec 'on
e
' to 'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h
Newren
merge-
r
ec
u
r
s
ive
:
rename
m
erge_op
t
ions argument from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h
Newren
Use '
u
n
s
i
g
ned shor
t
'
for mode,
l
ike diff_
f
i
lespec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah
N
e
wr
e
n
fast-import: fix err
o
neous handling of get-ma
r
k
wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Newren
fast-i
m
p
ort
:
only allow c
a
t-blob reques
t
s where
i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast
-
imp
o
rt: che
c
k
most
p
r
o
minent c
o
mmands first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newr
e
n
git-fast-import
.
txt: fix wording ab
o
ut where ls comma
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
El
i
j
ah Newren
t93
0
0: dem
o
nstrate b
u
g with get-
m
ark an
d
empty
orphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elija
h
Newren
merge-opti
o
n
s
.
txt:
c
orrect wording of --no-commit
o
pt
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elijah New
r
en
git-reb
a
s
e
.
txt:
update
t
o reflect m
e
rge no
w
implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elijah Newren
l
og,di
f
f-tree: ad
d
--c
o
mbined-
a
ll-paths
optio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah Newren
git-show-ref
.
txt:
fix order of fl
a
gs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elija
h
Newren
r
ebase: imple
m
ent --merg
e
via
t
h
e
in
t
eractive mac
h
in
e
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
j
a
h Newren
re
b
ase:
define linearization orde
r
ing and enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
ewren
git-
l
egacy-rebase: simpl
i
fy unnec
e
ssary triply-nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-r
e
base
,
sequencer:
e
xtend --q
u
iet option
for th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
am, rebase--merg
e
:
d
o
not overlook --s
k
ip'ed comm
i
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
a
h
Newren
t
5407
:
add
a
test demonstrating
how interactive handles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: fix incom
p
atible opti
o
ns
e
rror message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: mak
e
builtin and legacy scrip
t
e
rror messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
E
l
i
jah Newren
git
-
rebase
.
t
xt:
update n
o
te a
b
out directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
fast-expor
t
: add a --sh
o
w-original-ids option to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-import: remove unma
i
nt
a
ined duplic
a
te documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newre
n
f
a
s
t
-export: add
--
r
eference-excluded-p
a
rents
o
ptio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
f
ast-expo
r
t: ens
u
r
e
w
e
export reque
s
ted refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next