repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7800: don't rely on reuse_worktree_file()
2019-11-02
Elij
a
h Newren
R
elNotes/2
.
24
.
0
: fix sel
f
-cont
r
adictory
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newr
e
n
RelNotes/2
.
24
.
0: typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newr
e
n
me
r
ge-recu
r
sive: fix the fix to the di
f
f3 co
m
m
o
n ancestor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h Newren
fast-exp
o
rt: han
d
le nested tag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
j
ah Newr
e
n
t935
0
: a
d
d tests for tags of things
o
ther than a commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-exp
o
rt
:
allow user
t
o reques
t
tags be
m
arke
d
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah Newren
f
a
st-export
:
ad
d
support
for --import-m
a
r
ks-if-exists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newren
fast-import: add suppo
r
t for ne
w
'a
l
ias' command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
i
jah New
r
en
fast
-
impo
r
t: al
l
ow tags to be identified by
mark label
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
N
e
wren
fast-import: fi
x
h
a
ndli
n
g
of
d
e
let
e
d
tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Eli
j
ah Ne
w
r
e
n
merge-recursive: fix t
h
e
d
iff3 comm
o
n ancestor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
dir: special ca
s
e check fo
r
th
e
possibi
l
i
t
y that paths
p
ec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Eli
j
a
h
Newren
f
ast-e
x
port: fix exporting a
t
ag and
no
t
hing el
s
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: fi
x
the
o
retical
path corruption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
cle
a
n: rew
r
ap overly lo
n
g
line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
clean: avoid remov
i
ng untracked f
i
l
e
s in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
clean
:
disa
m
biguate
t
he definition
of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
w
ren
g
i
t-cl
e
an
.
txt: do not
c
l
a
im we will d
e
lete files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
j
ah
N
e
w
ren
dir: ad
d
comm
e
ntary expla
i
n
i
ng match_pat
h
spec_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah
N
ewre
n
d
ir: if our
pathspec might m
a
tch files u
n
der
a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Ne
w
r
en
dir: make the
D
O_MATCH_SU
B
MOD
U
LE code reusable
f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newre
n
dir: als
o
check directorie
s
for matchin
g
pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah
Newren
dir: fix off-by-one e
r
ror i
n
ma
t
ch_pathspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
i
jah Newren
dir: fix typ
o
in
c
omment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7300: a
d
d testcase
s
s
h
ow
i
n
g
failure to clean specified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Ne
w
ren
t9
9
02: use a non-deprecated com
m
a
n
d for testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah
N
e
w
ren
Recommend
g
i
t
-filter-repo
instead of gi
t
-filter-br
a
nch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elij
a
h Newren
t6006
:
simplify,
f
ix, a
n
d optimi
z
e empty message test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elij
a
h
Ne
w
ren
t3427: accele
r
ate
this test b
y
us
i
ng
f
ast-e
x
port and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
E
lijah Ne
w
ren
merge-o
p
tions
.
txt:
clarify mean
i
ng o
f
v
a
rio
u
s
f
f
-relat
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-recursive:
alph
a
betize in
c
l
u
de list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merge-recurs
i
ve: add
sanity checks for
r
elevant merge_opti
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-recursive: rena
m
e MERGE_RECU
R
SIVE_*
to
M
ERG
E
_VA
R
IANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newre
n
merge-recursive: split
i
nternal fi
e
lds into a sepa
r
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Ne
w
ren
merge-recursive: avoid losing output a
n
d leaking m
e
mory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ija
h
Ne
w
ren
mer
g
e-rec
u
r
s
ive: com
m
ent
and reorder th
e
merge
_
options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-r
e
cursive: consolidate u
n
n
e
cess
a
ry fields in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
w
r
en
merge-re
c
ur
s
ive
:
move some
d
e
finiti
o
ns around to c
l
ean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-recursive:
rename merge_opti
o
ns a
r
gument
to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
m
e
rge-rec
u
rsive
:
rename 'mrtree' to 'resul
t
_
t
ree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newr
e
n
merge-re
c
ursive: use com
m
on nam
e
for ancestors/comm
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah N
e
wren
merge-recursive:
fix some ove
r
l
y
l
ong
lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
cache-tree: s
h
a
re code between functi
o
ns writing an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merge-recursive
:
don't force
e
xternal
ca
l
lers to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge
-
recur
s
iv
e
:
r
e
m
o
ve useless parameter in merge_tree
s
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newr
e
n
merge-recursive:
exit early if index != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
Ensure i
n
dex matches h
e
ad before invoking mer
g
e machi
n
ery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
m
erge-recursive: rem
o
ve another implicit dependency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: future-proof up
d
a
t
e_file_flags() aga
i
nst
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-rec
u
rsive:
p
rovide a better
labe
l
for diff3 c
o
mm
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
merge-recursive:
enfor
c
e opt-
>
ancestor != NULL wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
i
jah Newren
ch
e
ckout:
pr
o
v
i
de b
e
t
ter con
f
lict
h
u
n
k description
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elij
a
h Newren
merge-rec
u
r
s
ive: be co
n
sisten
t
with
assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Eli
j
ah Newren
checkout: remove dupli
c
a
te co
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
El
i
jah Newren
git
-
f
a
st-import
.
txt: c
l
a
r
i
fy
tha
t
multipl
e
merge
c
ommits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
El
i
jah Newren
merge-recursiv
e
:
avoi
d
directory re
n
ame
d
e
t
ecti
o
n in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
E
lijah Newren
m
e
rge-recursive: rest
o
re a
c
cidentally dropp
e
d setting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
lij
a
h
Newren
f
ast-expor
t
: do
a
utomatic reencoding of commit m
e
ssages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-
e
xpo
r
t
: diff
e
r
e
n
tia
t
e
between ex
p
lic
i
tly
U
TF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Ne
w
ren
fast-
e
xport
:
avoid stripping encoding header if
w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ijah Ne
w
ren
f
a
st-import: support 'e
n
c
oding' commit
h
eader
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
Newr
e
n
t9350: fix en
c
oding t
e
st to
a
c
tually test re
e
ncoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elij
a
h Newr
e
n
Hono
r
core
.
p
recompose
U
n
i
c
ode in more p
l
aces
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
merge-recursive: switc
h
direct
o
r
y
rename de
t
ection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah
N
ewren
m
e
rge-r
e
curs
i
v
e
: give
c
a
l
l
ers of hand
l
e_content_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Ne
w
ren
mer
g
e
-
r
ecursiv
e
:
t
rack
i
nformati
o
n
a
ssociated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
t
6
0
4
3
: fi
x
co
p
ied test de
s
cription to ma
t
ch
its purpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
i
jah Newren
merge-recursive: swit
c
h
f
rom
(oid,mode
)
pairs t
o
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Ne
w
ren
merg
e
-recursive:
c
leanup handle_r
e
name_* func
t
ion
s
igna
t
ures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-re
c
ursiv
e
: track branc
h
w
h
e
r
e rename oc
c
urred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
merge-recursive: remove ren[1
2
]
_
ot
h
er fields fro
m
rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Newren
merge-
r
ecursive:
s
hrink rename_
c
onfl
i
c
t
_
i
nfo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h Newre
n
merge-recu
r
sive: move so
m
e
s
t
r
u
ct de
c
laratio
n
s together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merg
e
-
recursive: use
'ci'
f
o
r
rename_conflict_i
n
fo
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah New
r
en
merge-
r
ecursive: r
e
name locals 'o' an
d
'a
'
to 'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
m
e
rge-re
c
u
r
sive
:
rename diff_filesp
e
c
'
one' t
o
'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
me
r
ge-recursive: r
e
name merge_op
t
ions
argument from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
Use 'unsig
n
ed short' fo
r
m
o
de, like
diff_filespec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
N
ewren
fast-imp
o
rt: fix erroneous
han
d
ling of get-m
a
rk
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Newre
n
f
a
st-import: o
n
ly allow cat
-
blob requ
e
sts
where
i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Newren
fast-import: check most prominent commands first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
El
i
jah Newren
gi
t
-fast-impo
r
t
.
txt: fix wordin
g
ab
o
ut where ls comm
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Newren
t9300: demo
n
st
r
ate bu
g
with get-ma
r
k
and emp
t
y orphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newren
merge-options
.
txt
:
co
r
rect w
o
rding o
f
--no-commit opt
i
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elijah Newr
e
n
git-reba
s
e
.
txt: update t
o
r
e
flect m
e
rge now implement
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
E
lijah New
r
e
n
log,d
i
ff-tree
:
add
--
c
ombine
d
-all
-
paths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
E
l
ijah Newre
n
git-
s
ho
w
-ref
.
txt: fix o
r
d
er
of fla
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elijah
Newren
rebase:
i
mplement --merge vi
a
t
h
e inter
a
c
tive machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
ewren
rebase: def
i
ne l
i
nearization ord
e
rin
g
and enforce i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ij
a
h Newre
n
git-legacy-rebase: simplify unne
c
essary triply-neste
d
if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-rebase, sequencer: extend -
-
quiet option for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
a
h Newren
am, rebase--merg
e
: do not overloo
k
--skip'ed
c
ommits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
t5407: add
a te
s
t
d
e
m
o
nstrating ho
w
interactive handles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newr
e
n
r
ebase: fix incom
p
atib
l
e opti
o
n
s
error m
e
ssage
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
rebase:
m
ake
b
uiltin and legac
y
script error messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
E
lijah
N
ewren
git
-
rebase
.
txt: update note
a
bout directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
en
fast-export: add a --
s
how
-
original-ids o
p
t
i
on to
s
how
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah
Newren
fas
t
-imp
o
rt:
r
emove unmaintained dup
l
ic
a
te documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-ex
p
ort: ad
d
-
-
reference-excluded-parents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
f
ast-export: en
s
u
r
e we e
x
port requ
e
ste
d
ref
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next