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
sparse-checkout: update working directory in-process
2019-11-02
Elij
a
h
Newren
Rel
N
otes/2
.
24
.
0: fi
x
self
-
contradictory
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
El
i
jah Newren
RelNotes/2
.
2
4
.
0: typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Eli
j
ah Newren
t60
4
[236]: do
n
ot r
u
n setup in separate t
e
sts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah
N
ewren
merge-recursive: fi
x
m
erging a
s
ubdirectory
into the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Ne
w
ren
merge-recursive:
c
lean up
g
et
_
r
enamed_dir_portion()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
E
lijah
N
e
wren
merge-recursive: fix the fix to t
h
e diff3 common ances
t
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
Newren
fa
s
t
-export: handle nested
t
ag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
t9350: add tests for tags of thin
g
s
other tha
n
a commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah Newren
f
a
st-export: allow user t
o
request
t
ags be mark
e
d with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-export:
a
dd
support for
-
-import-marks-if-exists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-i
m
p
o
rt: add support
for ne
w
'alias' command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ij
a
h
N
ewren
fast-import: allow tags to
b
e
identified by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ija
h
Newren
fast-import: fix handling of dele
t
ed ta
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
merge-recursi
v
e: fix the diff3 common ancesto
r
l
a
b
e
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
dir: spe
c
ial
case check for the po
s
sibili
t
y that pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elija
h
Newren
fast-export:
f
i
x
exporting a t
a
g and no
t
hing
else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
c
lean: fix th
e
oret
i
cal
p
ath c
o
rrupti
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
cle
a
n: rewr
a
p overly
l
ong line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h
N
ewren
c
l
ean: avoid
removing untrack
e
d files i
n
a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
a
h
Newren
clean:
disambi
g
uate the d
e
finition of -d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
git-clean
.
tx
t
:
d
o
not cla
i
m we will dele
t
e files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir: add
c
ommentary ex
p
laining match
_
pat
h
spec_i
t
em
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir: if our pat
h
spec m
i
ght mat
c
h files u
n
der a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: make the D
O
_
M
A
TCH_SUBMODULE code reusable
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
dir: also check di
r
e
c
t
ories for matching pathspec
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
en
dir: f
i
x
off
-
by-one error in match_path
s
pec_
i
tem
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: fix
ty
p
o in
c
omment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7300: add testcases s
h
owin
g
fail
u
re to clean spec
i
fie
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elija
h
New
r
en
t
9902: use a
n
on-depre
c
at
e
d
c
o
mman
d
f
or testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah Newren
Recomme
n
d git-f
i
lter-repo instead
o
f
g
i
t
-f
i
l
ter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah New
r
en
t
6
006: simplify, fix, a
n
d opti
m
ize emp
t
y messa
g
e test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t3427
:
acc
e
lerate
t
his te
s
t
b
y u
s
ing fast-export
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
E
l
ij
a
h Newren
merge-op
t
i
o
n
s
.
txt:
cl
a
rify me
a
ning of var
i
o
us ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
erge-
r
ecursi
v
e: alphabetize include
li
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lija
h
Newren
me
r
ge-re
c
ursiv
e
: add sanity checks for
relevant merge_opt
i
o
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
N
ewren
merge-recursive: r
e
n
a
me MER
G
E_RECURSIV
E
_*
t
o ME
R
GE_VARIANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
rge-recursive: s
p
lit int
e
r
n
al fields int
o
a se
p
ar
a
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewre
n
merge-recursive: avoid
los
i
ng ou
t
put and
lea
k
ing
m
emory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
m
erge-recur
s
ive:
c
omment and reorde
r
the merge_opt
i
ons
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah N
e
wren
m
e
rg
e
-
recursive: consolid
a
t
e unnecessary field
s
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merge-recursive: move some definitions around to
clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
erge-recursive: rename merg
e
_options argum
e
nt to op
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah
N
ewren
merge-recursive:
r
ename 'mrtree' t
o
'
r
esul
t
_tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah
Newre
n
merge-recursive: use com
m
on name for ancestors/
c
om
m
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
me
r
ge
-
r
e
c
ursive: fix some overly long
lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
w
r
en
cache-tree:
s
har
e
code between f
u
nctions
w
r
i
ting an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah N
e
wren
merge-recursive: don't force external ca
l
l
e
rs to do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
New
r
e
n
merge-
r
ecursive:
re
m
ove useless parameter in merg
e
_
t
rees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merg
e
-
r
ecursive: ex
i
t earl
y
i
f inde
x
!= head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
Ensure index matche
s
h
e
ad
b
efore invok
i
ng m
e
rge machinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newre
n
merge-recursive: remove another
i
mplici
t
de
p
endency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
m
e
rg
e
-rec
u
rsive: future-proof
update_file_f
l
ags() against
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-r
e
cursive: pro
v
ide a better label for diff3 common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
merge-recur
s
ive: en
f
orce
o
pt->ancestor != NULL when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
c
heckout:
p
r
o
vide better conflict hunk de
s
crip
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Eli
j
ah New
r
en
merg
e
-recursive: be consistent wi
t
h
assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Ne
w
ren
checkout: rem
o
ve duplic
a
te code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elija
h
Newren
git-fa
s
t-import
.
txt
:
clarify
t
hat multiple merge com
m
its
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
E
lijah Newren
me
r
ge-recursive: avoid directory rename detection
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
Eli
j
a
h Ne
w
ren
mer
g
e-recur
s
i
v
e:
r
estore accidentally dropped setting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
l
ij
a
h
Newren
fast-exp
o
rt:
do au
t
oma
t
ic
r
een
c
o
din
g
of c
o
mmit messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
N
ewren
f
ast-
e
xport:
d
iffer
e
ntiate between explic
i
t
l
y
U
TF
-
8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h Newren
fast-e
x
port: av
o
id stripping en
c
oding header i
f
we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah N
e
wren
fast-import: su
p
port 'encodi
n
g' commit head
e
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
E
lijah Newr
e
n
t9350
:
fix encoding
test to ac
t
ually test reencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah
N
ewren
Honor
c
ore
.
precomposeU
n
icode
i
n more places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
merge-r
e
c
u
rsive
:
s
w
itch d
i
rectory rename det
e
ction
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah
N
e
w
ren
merg
e
-recursive:
g
i
v
e
call
e
rs of handle_content_merg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
me
r
ge-r
e
cursive:
t
rack infor
m
ation associat
e
d
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newre
n
t6043:
f
ix
copied tes
t
description to
match its purpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah Newren
m
erge-recurs
i
ve: switc
h
from (
o
id
,
mode) pai
r
s
to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h
N
e
wren
merge-
r
e
c
ursive: cleanup
han
d
l
e_re
n
ame_*
f
unc
t
ion signatures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah Newren
mer
g
e
-recurs
i
ve: track branch where rename occurred
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah New
r
e
n
merge-re
c
ursive: re
m
ove ren[12]_other fields from rename_con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
erge-recursiv
e
: shri
n
k rename_conf
l
ict_inf
o
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
m
erge
-
r
e
curs
i
ve: move some st
r
uc
t
declaration
s
together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-re
c
ursive
:
use 'ci' for rename_confli
c
t_in
f
o
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
m
e
rge-recur
s
ive:
r
ename locals
'o'
a
nd 'a' to
'
ob
u
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-
r
ecur
s
i
ve
:
re
n
ame di
f
f
_filespec '
o
ne'
t
o 'o'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursive
:
r
e
n
ame
m
erge_optio
n
s arg
u
ment from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
Us
e
'
u
nsi
g
ned short' for mode
,
like diff_filespec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
Newren
fast-import: fix
erron
e
o
us handling of
g
et-mark with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-import: o
n
ly allow
c
at-blob requests where it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah Newren
fast-import:
che
c
k most pr
o
minent commands
firs
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah Newren
git-fast-im
p
o
r
t
.
tx
t
: fix wording about where ls
command
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah N
e
wren
t9300: demonstrate bug
with get-mark and
e
mpty orphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
E
lijah New
r
en
merge-options
.
t
x
t:
c
orrect w
o
rding of
--no-comm
i
t
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elijah Newre
n
gi
t
-re
b
ase
.
t
x
t:
update to
reflect
m
e
r
ge no
w
i
mplemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elijah
Newr
e
n
log,diff-
t
ree: add --combined
-
a
ll-paths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Eli
j
ah
Newren
git-show
-
ref
.
tx
t
: fix
o
rder of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
E
lija
h
N
ewren
rebase: i
m
pleme
n
t --merge via the interac
t
iv
e
machine
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Newren
reba
s
e:
de
f
in
e
linearization or
d
er
i
ng and enforce
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
git
-
legacy-reb
a
se: simplify u
n
necessar
y
t
r
iply-ne
s
ted i
f
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Newre
n
g
it-rebase, sequ
e
ncer: exten
d
-
-quiet op
t
ion for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
Newren
a
m, rebase--merge
:
do not ove
r
look --skip'e
d
com
m
its
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
t5407: a
d
d a t
e
s
t dem
o
ns
t
r
a
ting
h
ow i
n
teractive handles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
r
e
n
rebase
:
fix incompa
t
ible opti
o
ns error messag
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: make buil
t
in and legac
y
scrip
t
error messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah Newren
g
i
t-rebase
.
txt: update note abo
u
t directory
r
ena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ija
h
Newren
fast-expo
r
t: add a -
-
show-ori
g
inal-ids opt
i
on to sho
w
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next