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
check-ignore: fix documentation and implementation to match
2020-02-18
Eli
j
ah Newren
ch
e
ck-
i
g
nor
e
: fix documentation an
d
imp
l
e
me
n
ta
t
io
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Eli
j
ah New
r
en
Rel
N
otes/2
.
2
4
.
0: fix self-contradictory
not
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
R
elNotes/2
.
24
.
0: t
y
p
o
fix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
E
lijah N
e
wren
merge-
r
ecursiv
e
: fix
the f
i
x
t
o the diff3 common ancestor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah Newren
fas
t
-
export
:
h
andle nested tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah N
e
w
ren
t9350: ad
d
test
s
for ta
g
s o
f
things o
t
her
t
h
an a co
m
mit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Ne
w
ren
fast
-
export: allow user to request tags be marked with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-export:
a
dd su
p
p
o
rt fo
r
--
i
mport-marks-if-exist
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-imp
o
rt: add support for new 'alias
'
c
ommand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newr
e
n
fast-import: al
l
ow ta
g
s to be identified by mark
labe
l
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
E
l
i
jah
New
r
en
fast-
i
mport: f
i
x
h
andling
of deleted tag
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
m
e
rge-recursive
:
fi
x
the diff3
com
m
on anc
e
stor label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
d
ir: specia
l
case check for the
p
ossibi
l
ity that
pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah
Newren
fas
t
-export: fix
ex
p
o
rting a tag and nothing else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
N
ewren
cle
a
n: f
i
x th
e
ore
t
ical pat
h
c
orruption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Ne
w
r
e
n
clean: rew
r
ap overly
l
ong line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
clean: avoid removing untracked files
in a nes
t
ed
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
clean:
disambiguate the definition
of
-
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
git-
c
lean
.
txt
:
do not cla
i
m
w
e will delete files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
dir: add comment
a
ry
expla
i
ning match_p
a
thspec_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
li
j
ah Ne
w
ren
dir: if
o
ur pathspec might matc
h
fil
e
s under a di
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Newren
dir:
make the DO_MATCH_SUBMODULE code reusable
f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah N
e
w
ren
dir: als
o
chec
k
di
r
ectories for matching pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah
Newren
di
r
: fix of
f
-by-one
e
rror in matc
h
_pathsp
e
c_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Eli
j
ah Newren
dir: fix typo in
comm
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
en
t7300:
a
dd testc
a
ses showi
n
g
fail
u
re to clean specified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah New
r
e
n
t
9
902: use a non-depreca
t
ed command
for
testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newre
n
Re
c
o
mmend git-filter-repo instead of git-filter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t
6
006:
simplify, fix, and optimize em
p
ty message te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newre
n
t
3
4
27: accelerate this
test by using fast-
e
xp
o
rt
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
E
l
ijah N
e
wren
merge-op
t
ions
.
txt: clari
f
y
meaning o
f
v
a
rious ff-rel
a
t
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
m
erge-r
e
cursive: alph
a
betize
i
nclud
e
list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah N
e
wren
merge-recursive: ad
d
sanity che
c
ks for relevant m
e
rge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
m
erge-recursi
v
e: rename MERGE_RECURSIV
E
_*
to MERGE_VA
R
IANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge
-
recursi
v
e: split internal fi
e
lds into a separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
merge-recursive: av
o
id
losi
n
g output a
n
d
l
e
aking me
m
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merge-recursive: comment and reorder the
m
e
rge_
o
ptions
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
merge-
r
ecursive: consol
i
d
a
te
u
n
n
e
cessary
f
i
e
l
ds in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-recursive: move some def
i
nitions aroun
d
t
o
clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
a
h
Newren
m
e
rge-recursive: renam
e
merge_options arg
u
ment to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-recurs
i
ve: rename 'mrtr
e
e'
to 'result_tr
e
e',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
merge-recurs
i
ve
:
use common name
for
a
ncestors/
c
ommon
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
me
r
ge-recursive: fix some
overly long
l
ines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
c
a
ch
e
-tree: share
code bet
w
een functio
n
s writing an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lij
a
h Newre
n
mer
g
e-recu
r
sive: don't fo
r
ce external calle
r
s t
o
do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah
N
ewren
merge-recursive: remo
v
e us
e
less parameter in merge_trees()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recu
r
sive: exit early if index != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newre
n
Ensure
i
ndex mat
c
h
e
s hea
d
b
e
fore
i
n
v
oking merge
m
ach
i
nery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
merge-recur
s
i
v
e: remove
a
nother
implicit
d
ependency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ija
h
N
ewren
m
erge-r
e
c
u
rsive: futur
e
-proof up
d
ate_
f
ile_
f
lags() aga
i
nst
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-recursive: provide a better
labe
l
for diff3 commo
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newr
e
n
m
er
g
e-recursive:
enforce opt->ances
t
o
r
!
=
NULL whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
E
l
ijah Newren
checkout:
p
rovide better conf
l
ict hu
n
k de
s
cription
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah
N
ewren
merge
-
recursive: be cons
i
st
e
nt with assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
c
heckout
:
remove d
u
p
l
icate
code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah N
e
w
r
en
git-fast-impor
t
.
txt: cl
a
rify that multiple merge
commit
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elija
h
Newren
merge-recursive: av
o
id directory rename det
e
ction in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
E
lijah Newre
n
merge-recursive:
r
es
t
ore accidentally dropped set
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h New
r
en
f
a
st-ex
p
ort: do a
u
t
omatic
r
een
c
oding of commit
messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
El
i
jah Newren
fas
t
-e
x
port: dif
f
erentia
t
e between explicitly UTF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newr
e
n
fa
s
t-expor
t
: avoid stri
p
ping encoding header if we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah
N
e
wre
n
fast-import: supp
o
rt 'enc
o
ding
'
commit header
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
El
i
jah Newren
t
9350: fix en
c
o
d
ing test to act
u
ally test reencoding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah
N
e
w
ren
Ho
n
or core
.
precomposeUnicode in
m
ore pla
c
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Ne
w
r
en
m
erge-recursive: switch dire
c
t
o
ry
re
n
ame detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah Newren
merg
e
-recursive:
giv
e
cal
l
ers o
f
handle_c
o
ntent_merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah Ne
w
ren
merge-
r
ecursive: track information associated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
ewr
e
n
t60
4
3: fix c
o
pied test
descri
p
ti
o
n to
m
atch its purpose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
me
r
ge-recur
s
i
v
e:
switch from (oid,mode) pairs
t
o
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
ja
h
N
e
wre
n
merge-recu
r
s
i
ve: clea
n
up handle_rena
m
e_
*
function signatures
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
m
e
rge-r
e
cursive:
track bran
c
h where
r
enam
e
o
cc
u
r
r
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recursive: r
e
move
r
en
[
12
]
_other
fie
l
d
s
fr
o
m rename_
c
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah Newren
mer
g
e-recursive: shrink renam
e
_co
n
fli
c
t_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-recur
s
ive: move
some struct declarations together
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah New
r
en
merge-rec
u
rsive: use 'ci' for re
n
ame_conflict_
i
n
fo
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah N
e
wren
m
erge-recursive: rename locals
'
o'
and 'a' t
o
'obuf
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
jah New
r
e
n
m
erge-r
e
cursive: r
e
nam
e
diff_filespec '
o
ne' to '
o
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elija
h
Newren
merge-rec
u
rsive: ren
a
me mer
g
e_options argument f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ij
a
h Newr
e
n
Use 'u
n
signed s
h
ort
'
f
o
r mode, like diff_files
p
ec does
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
fast-imp
o
rt:
fix erro
n
eou
s
hand
l
ing of get-
m
ark with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
a
h
Newren
fas
t
-imp
o
rt: only allow cat-blob requests whe
r
e it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Ne
w
ren
fast-import: check
most p
r
o
minent commands first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newren
gi
t
-fast-import
.
txt: fix
w
ording about where ls c
o
mmand
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Ne
w
ren
t9300: d
e
monstrate bug with
get-mark and emp
t
y orp
h
an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newr
e
n
merge-options
.
txt
:
c
o
rrect wo
r
d
i
n
g
of --no-commit option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
Elij
a
h Newren
git-rebase
.
txt:
upd
a
te to reflect
merge now
i
mplemen
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
E
l
ijah Newren
l
o
g,di
f
f-tree: add --c
o
m
bined-all-
p
ath
s
op
t
i
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah Newren
git-s
h
ow-r
e
f
.
txt: fix order o
f
flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
E
l
ija
h
Ne
w
ren
reb
a
se:
i
m
p
l
e
ment --merge via
the intera
c
tive machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase:
de
f
ine lin
e
ari
z
ati
o
n ordering a
n
d en
f
orce
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah Newren
git-legacy-rebase:
simplify
u
nnecessar
y
t
r
i
ply-nest
e
d
if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
New
r
en
git-rebase, sequenc
e
r: extend
-
-quiet op
t
ion for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
a
m
, reb
a
se--m
e
r
g
e: do no
t
overl
o
ok
--sk
i
p'ed commi
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah N
e
w
re
n
t5407: add a test demons
t
r
a
t
ing how interac
t
ive ha
n
dles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
El
i
jah Newren
rebase:
fix incompatible options
error me
s
sage
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newr
e
n
r
eb
a
se: mak
e
bu
i
ltin and
legac
y
scr
i
pt err
o
r me
s
s
a
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
El
i
jah Newren
git-rebase
.
txt: u
p
date note about di
r
ectory ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Ne
w
r
e
n
f
ast-e
x
port: add
a --show-
o
riginal-ids option to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-im
p
ort: r
e
move unm
a
i
ntained du
p
l
icate docu
m
ent
a
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah New
r
en
fast-exp
o
r
t
:
a
dd
-
-
reference-exclu
d
ed-parents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next