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
myfirstcontrib: hint to find gitgitgadget allower
2019-11-02
E
l
ijah New
r
e
n
R
e
lNotes/2
.
24
.
0
:
fix
self-
c
ontradictory n
o
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
Re
l
Notes/2
.
24
.
0: typofix
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elijah
Newren
merge
-
recursive: f
i
x
t
he
f
ix to
the diff3 common an
c
estor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-exp
o
r
t
: ha
n
dle n
e
sted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
N
ewr
e
n
t93
5
0: add
tests for
tags of
t
hings other than a c
o
mmit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newr
e
n
fas
t
-export:
a
ll
o
w user to request tag
s
be
m
arked wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Ne
w
ren
fast-export: add support for --import-mark
s
-if-exists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
jah N
e
wren
f
ast-import:
a
dd support for new 'ali
a
s' comma
n
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-
i
mport
:
a
l
low tags to
b
e ide
n
tified b
y
mark la
b
els
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-i
m
p
o
rt: fix handling
of deleted tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
merge-recursive:
f
ix the
d
iff3 common ancest
o
r
l
a
b
el
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
dir: special cas
e
chec
k
for the possibility that pathspe
c
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newr
e
n
f
a
st-
e
xport: fix exporting a t
a
g and nothing else
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
clean: fix t
h
eoretica
l
path
c
orruption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah
Newr
e
n
clean: rewrap over
l
y long line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newren
clean: avoid r
e
moving
u
n
t
rac
k
ed fil
e
s
in a nested git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean:
disambig
u
at
e
the defini
t
i
o
n o
f
-
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah
N
ewren
git-
c
l
ean
.
txt: do not claim we will d
e
le
t
e files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ij
a
h Newren
dir: add
commentary exp
l
aining match_path
s
pec_ite
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: if
o
u
r pathspec might
m
atch
f
i
les under a dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah
N
ewren
dir: make t
h
e
DO_MA
T
C
H_SU
B
MODULE code
reusab
l
e for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
i
r: als
o
ch
e
ck
directories for match
i
ng pathspec
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah Newren
dir: fi
x
off-by-one e
r
ror in match_pa
t
hspec_item
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
El
i
jah Newren
d
ir:
f
i
x typo
i
n comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
t7300: ad
d
testcase
s
s
h
o
w
in
g
f
a
i
l
ure to clean spe
c
ified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t99
0
2: use a no
n
-depreca
t
ed command for testing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newr
e
n
Recommend git-f
i
lter-repo instea
d
o
f git
-
filter-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t6006: simplify
,
f
ix, and o
p
t
i
mize empty
message
te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t
3
4
27: accelerate this test by using fast-ex
p
ort and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
E
lija
h
Newren
m
e
rg
e
-option
s
.
txt: cla
r
ify
m
eaning of various ff-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
merg
e
-recursive:
a
lphabetiz
e
include
list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah N
e
wr
e
n
merge-recursive: add sanity
checks
f
or releva
n
t
me
r
ge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-rec
u
rsive: re
n
ame
M
E
R
G
E
_R
E
C
U
RSIVE_* to MERG
E
_
V
A
R
IANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elij
a
h Newren
merge-recursive
:
split internal field
s
into a separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
mer
g
e
-r
e
cursive:
a
vo
i
d l
o
sing output and leaking me
m
o
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wr
e
n
m
e
rge-recursive: comment and reorder the merge_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wre
n
merge-recursive: c
o
ns
o
l
i
date unnecess
a
ry
f
ields in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
a
h Newren
me
r
g
e
-recurs
i
ve: move some definition
s
a
round
t
o
c
lea
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
j
a
h Newren
merge-r
e
c
ur
s
ive:
r
enam
e
m
erge_opti
o
ns argument to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recur
s
ive: ren
a
me 'mrtree' to 're
s
ul
t
_tree',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-re
c
ursive: use common na
m
e
fo
r
ancestors/common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
en
merge-recursive: fix some overly lon
g
lines
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
cache-tree: share cod
e
between functions
w
r
iting an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah
Newren
m
erge-recursive: don't
fo
r
c
e
external callers to
do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
N
ewren
merge-recursive: remove useless
paramet
e
r
i
n
m
e
rge_t
r
ees(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
j
ah Newre
n
merge-re
c
ursive: exit ea
r
l
y
if index != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
e
w
ren
Ens
u
re index matches hea
d
b
efore
invoking me
r
ge mach
i
nery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
i
jah Newre
n
merge-recursive: rem
o
ve another imp
l
icit d
e
p
endenc
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah New
r
e
n
merge-re
c
u
r
sive: f
u
ture-proof update_file_fl
a
gs() against
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
rge-r
e
cursive: provide
a better l
a
bel for diff3 common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Eli
j
a
h
N
ewren
m
erge-rec
u
rsive: e
n
f
o
rce opt->ancestor != NULL wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
checkout: p
r
ovide bet
t
er conflict hunk descr
i
ption
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah Newren
me
r
ge-recursive: be consis
t
e
n
t
with assert
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-16
Elijah New
r
e
n
checkout:
r
emove duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-12
Elijah New
r
en
git-
f
ast-imp
o
rt
.
txt: cl
a
rify that multiple merge commi
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-06
Elijah Ne
w
ren
m
e
rge
-
r
e
c
u
r
sive: avoid di
r
ectory ren
a
me
detection in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-06-05
El
i
j
a
h
Newren
merge-recursi
v
e: r
e
store
ac
c
identally dropped setting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-expo
r
t: do au
t
om
a
t
ic reenco
d
in
g
of commit
m
e
ss
a
g
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-export:
differentiate betwe
e
n expli
c
itly UTF-8
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elij
a
h Newren
fas
t
-export: avoid stri
p
pi
n
g encoding
h
e
a
der
i
f we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newre
n
fast
-
i
m
port: support 'e
n
c
oding' c
o
mmit
h
eader
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
t9
3
50:
fi
x
enco
d
i
ng test to actual
l
y
t
e
s
t
ree
n
coding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-26
Elijah Newren
Honor core
.
preco
m
poseUnicode in
more places
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
Newren
merge-
r
ecur
s
i
v
e
: switch dire
c
tory rename detec
t
io
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h
Newren
merge
-
re
c
ursive
:
give callers of han
d
le_co
n
ten
t
_mer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newr
e
n
m
e
rge-recursive: track information ass
o
c
i
ated with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
t
6043: fix co
p
ied
test desc
r
ipti
o
n t
o
match its pu
r
pose
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
l
ijah N
e
w
r
en
mer
g
e-recur
s
ive: switch from (
o
id,mode)
pairs
to a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lija
h
Newren
merge-recurs
i
ve: cleanup ha
n
dle_rena
m
e_* fun
c
ti
o
n signatu
r
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
E
lijah Newren
m
e
rge-recurs
i
ve: track branch where rename o
c
c
u
r
red
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
El
i
ja
h
Newren
me
r
ge
-
recursi
v
e:
r
emove re
n
[12]
_
other fields f
r
o
m
renam
e
_
con
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah
N
e
w
ren
merge-recursive:
shrink rename_conflic
t
_info
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
ah N
e
wren
merge-recursive: move some struct
d
eclarations
t
oge
t
her
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Eli
j
a
h Newren
merge-r
e
c
ur
s
ive
:
u
s
e
'ci' for
r
en
a
me_conflict_info
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah N
e
w
r
en
merge-recursive: rename locals 'o
'
and
'
a'
to 'obu
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elij
a
h N
e
wren
merge-rec
u
rsive: rename
d
i
ff_file
s
pec 'one' to '
o
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newren
merge-r
e
c
u
rsive:
rename merge_optio
n
s argume
n
t fr
o
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-08
Elijah Newre
n
Use 'unsigne
d
short' for mode, like d
i
ff_f
i
lespec
d
oes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Newren
f
a
st-
i
mport: fix er
r
on
e
ou
s
han
d
ling of get-mark with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
Newren
fast
-
i
mport: only
a
llow cat-blob r
e
q
u
e
s
ts where it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Ne
w
ren
fast-import: check most
p
rominent
c
o
m
m
and
s
first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
i
j
ah
N
e
wren
git-fast-import
.
txt: fi
x
word
i
ng about where ls command
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
lijah Newren
t
9300:
demonstrate bu
g
wi
t
h get-mark
a
nd e
m
pty or
p
han
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Newren
merge-options
.
txt: correct wording
o
f --no-commit
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
El
i
jah Newren
git-rebase
.
txt: update
to reflect merge
n
ow implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
E
l
i
jah Newren
l
og,diff-tr
e
e:
add
--
c
ombin
e
d
-all-p
a
ths option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Eli
j
ah Newren
git-sh
o
w-ref
.
txt:
f
ix order
o
f flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elijah Newren
rebase: impleme
n
t --merge via t
h
e i
n
teractive mach
i
ne
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
r
ebase: define linearization ordering and enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Newre
n
g
i
t-lega
c
y-rebase:
s
i
m
p
lify unnecessary tripl
y
-nes
t
ed if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
g
i
t-rebase, sequen
c
er: extend --qui
e
t op
t
ion for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
am,
rebase--merge
:
do
not overlook --skip'ed c
o
mmits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newre
n
t
5407: add a tes
t
dem
o
nstrating how i
n
teractive handl
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: fix incompat
i
ble option
s
er
r
o
r message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newr
e
n
rebase: make builtin and leg
a
cy script error
m
e
s
sages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah N
e
wren
git-reb
a
s
e
.
txt: update note about
d
irectory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h
Newren
fast-export: ad
d
a --show-original-
i
ds opti
o
n
to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h Newren
fast-import:
r
emove u
n
mai
n
tained duplic
a
t
e
documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export:
add --
r
eference-exclude
d
-par
e
nts option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: en
s
ure w
e
export requested ref
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next