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
fast-export: do automatic reencoding of commit messages only if requested
2019-05-14
Elijah New
r
en
f
a
st-export: do aut
o
matic ree
n
coding of commit messa
g
e
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
fast-e
x
p
o
r
t
:
d
ifferent
i
ate between
e
xplic
i
t
l
y UTF-8
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elijah N
e
wre
n
f
ast-expo
r
t
:
avoid s
t
ripp
i
n
g enc
o
ding
header if we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newren
f
a
st-im
p
ort: support 'encoding' c
o
mmit header
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-05-14
El
i
jah
N
ewren
t9350:
f
i
x
encoding te
s
t t
o
act
u
ally test reencodi
n
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newren
fast-impo
r
t: fix erro
n
eous
h
andl
i
ng of g
e
t-mark with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elij
a
h Newren
f
a
st-i
m
port: only allo
w
c
a
t-blo
b
requ
e
sts where it
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah New
r
en
fast-import: che
c
k most prom
i
nent commands first
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
El
i
jah Newr
e
n
git-
f
ast-im
p
o
r
t
.
txt
:
f
ix wording a
b
o
ut whe
r
e ls command
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
t9300
:
demons
t
rate bu
g
wit
h
g
et-ma
r
k and empty orph
a
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-21
Elijah Ne
w
ren
merge-opt
i
ons
.
t
x
t
: co
r
rect word
i
n
g
o
f
-
-no-commit option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-14
Elijah Newren
git-rebase
.
txt: up
d
a
te to
r
eflect merge no
w
implemen
t
e
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-02-08
E
l
ijah Newren
log
,
diff-tree: a
d
d
-
-
com
b
ined-all-paths op
t
i
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-01-10
Elijah Ne
w
r
en
git-show-r
e
f
.
txt: fix orde
r
of flags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-01-07
Elijah Newr
e
n
reba
s
e:
i
mpl
e
ment --merge v
i
a t
h
e in
t
eractive mach
i
nery
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
r
ebase: define l
i
neari
z
ation ordering and en
f
o
r
ce it
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ij
a
h New
r
en
git-legacy-rebase: simplify
u
nne
c
ess
a
ry triply-nested if
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Ne
w
ren
gi
t
-rebas
e
, s
e
quencer: extend --q
u
iet o
p
tio
n
for
t
he
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elijah
N
ewren
am
,
rebase--merge: do not ove
r
look --skip'
e
d
c
om
m
its
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah New
r
en
t5407: add a test demonstrating h
o
w
interactive handles
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
El
i
j
ah Newren
reb
a
se: fix incomp
a
tible options error messag
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newre
n
re
b
ase: m
a
ke builti
n
an
d
lega
c
y
script er
r
or mes
s
ages
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-12-09
Elijah Newren
gi
t
-r
e
bas
e
.
txt: up
d
ate n
o
t
e about di
r
e
c
tory rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ija
h
N
ewr
e
n
fa
s
t-e
x
port: add a --show-
o
ri
g
inal-ids option to show
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h
Newren
f
a
s
t-impo
r
t: remove unmaintained duplicate documentation
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newre
n
fast
-
export: add
--reference-excluded-
p
ar
e
nts opti
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
fast-export: e
n
sure we export req
u
ested re
f
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
fa
s
t
-
export: whe
n
using paths,
a
void corrupt st
r
eam
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
f
a
s
t-ex
p
ort: mo
v
e c
o
mmit
rewriting logic into a
function
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Ne
w
re
n
fast-ex
p
ort:
a
v
oid
d
y
ing when f
i
ltering
b
y
p
aths and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
fast-export: use
v
alue from correct enum
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
git-fast-export
.
txt
:
c
la
r
ify misleading documentati
o
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Newren
git-fast-import
.
txt: fix
docu
m
entation f
o
r
--quiet
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
fast
-
export: convert
s
ha1 to oid
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
li
j
ah Newren
t60
3
6,
t
604
3
: increase c
o
de coverage for file collision
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
erge-recursive: improve r
e
n
a
me/rename(1to2)/add[/add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah
N
ewre
n
merge-rec
u
rsive:
u
se
h
a
n
dle_
f
il
e
_co
l
lisi
o
n for add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ij
a
h New
r
en
mer
g
e-
r
ecu
r
sive: i
m
prove handling
for rename/rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recu
r
sive:
fix rename/
a
dd conflict handling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
El
i
j
ah Newren
merge-
r
ecur
s
ive: new function for bett
e
r colliding
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
Newren
merge
-
rec
u
rsive: incre
a
se marker l
e
n
g
th wit
h
d
epth
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036,
t6042: testc
a
s
es fo
r
re
n
a
m
e col
l
ision of alr
e
ady
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
wren
t
6
042: ad
d
tests for consistency in file collisi
o
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Newren
fsck:
m
ove
fsck_head_link()
to get_de
f
ault_heads(
)
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newre
n
merge-rec
u
r
s
ive: avoid showing
co
n
flic
t
s with merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-10-18
E
l
ijah Newren
merge-recu
r
sive: im
p
rove auto-
m
er
g
ing m
e
ssages with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
commi
t
: fix erro
n
eo
u
s
BUG, 'multiple renames o
n
the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-20
El
i
jah Newren
merge-recursive:
rename merge_file_
1
() and merge_conten
t
()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
Newren
merge-recursive: remove
f
inal remain
i
ng caller of merge_fi
l
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-20
Elija
h
Newren
mer
g
e
-recur
s
ive: avoid w
r
apper fun
c
tion
w
h
e
n
unnecessary
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-20
El
i
jah Newren
merge-re
c
ursiv
e
: set paths c
o
rrectly when three-way
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-13
Eli
j
ah Newren
sequencer:
f
i
x -
-
allow-
e
mpty-mes
s
age be
h
avio
r
,
m
ake
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-ref: allow -
-
n
o
-deref with --s
t
din
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-12
Elij
a
h New
r
en
update-ref: fix type of update_flags variab
l
e to match
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-11
E
l
i
j
ah N
e
wren
r
er
e
re: avoi
d
b
uf
f
e
r overrun
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
t4200
:
demonstrate r
e
re
r
e s
e
gfault on sp
e
ci
a
l
l
y
crafted
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-09-05
E
l
ij
a
h Newren
Re
m
o
v
e su
p
erfluous
trailing semi
c
olons
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-30
Elij
a
h
N
ewren
am: avoid directory re
n
ame detectio
n
when ca
l
ling recur
s
ive
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
Newr
e
n
merg
e
-recursive: add ability to turn of
f
d
i
r
e
ctory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newren
t3401: add another di
r
ectory rename testcase for rebas
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Ne
w
re
n
Remove forward
d
ecla
r
a
t
ion of an
e
num
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h
Newren
c
ompat/precompose_utf8
.
h: use mor
e
c
o
m
mon incl
u
de guard
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h N
e
w
r
en
urlmat
c
h
.
h: fix include guard
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah Newre
n
Move definition of enu
m
branc
h
_
t
rack from cach
e
.
h
to
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newr
e
n
al
l
oc: make allocat
e
_alloc_state and
clear_alloc_
s
tate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newren
A
dd missing includes an
d
forw
a
rd declaratio
n
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h Newren
g
i
t-up
d
ate-i
n
dex
.
txt
:
reword po
s
s
i
b
l
y
conf
u
si
n
g exam
p
le
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newr
e
n
t
7
4
06: avoid us
i
ng test_must_fail for commands other
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah Newren
t74
0
6: prefer te
s
t_* helper functio
n
s to test -[feds]
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406
:
avoid hav
i
ng
g
it commands upstream of a pipe
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewren
t7406:
s
implify by using diff
-
-
name-only instead of
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newren
t7406: fix
c
all
that was faili
n
g for the
w
rong
r
eason
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-08-06
E
l
i
j
a
h Newren
t303
1
: update te
s
t d
e
scri
p
tion to
m
ention desi
r
ed
b
ehavior
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newre
n
re
a
d-
c
ache
:
fix
d
irect
o
ry/file
co
n
flic
t
ha
n
dling in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newre
n
t
1
015:
d
e
monstrate directory/f
i
le confli
c
t recovery
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
merge-re
c
ur
s
ive:
p
rese
r
v
e skip_
w
orktree bit when necessary
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
re
n
t7405: veri
f
y 'merge --abort' works after submodule
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newre
n
t7405
:
ad
d
a directory/s
u
b
m
odule conflict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7
4
05:
add a fi
l
e/submodule conflict
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
merge: fix misl
e
ading p
r
e-merge check do
c
umentation
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
me
r
ge-recursive: enforce rul
e
that
i
ndex matches h
e
ad
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
t60
4
4:
add more te
s
t
c
ase
s
with
st
a
ged chan
g
es before
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recursive: fix ass
u
m
p
t
ion that h
e
ad tr
e
e
b
eing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah N
e
wr
e
n
merge-recurs
i
ve:
make sure when we say
w
e
abort that
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
w
r
e
n
t6044: add a testc
a
se for index matc
h
ing head, when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah N
e
wren
t
6036: a
d
d a failed confli
c
t de
t
ection case: regular
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-06
E
lijah Newren
t6036:
add lots of detail for dir
e
ctory/file conflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah New
r
en
t6042: add testcase cove
r
i
n
g long chains
o
f
r
ename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6042
:
add testcase covering rename/ren
a
me
(
2to
1
)/d
e
lete
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6042: add t
e
stcase covering ren
a
m
e/add/d
e
lete confli
c
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6036: add a faile
d
c
o
nflict detection case wit
h
c
on
f
lict
i
ng
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t603
6
: add a failed confli
c
t
detection case
with submodule
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah N
e
wren
t
6
036:
add
a failed con
f
lict detection case with submodu
l
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
jah
N
ewren
t6036: add a failed conflict detect
i
o
n case with
s
yml
i
n
k
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
t
6
036: add a failed
c
onflict detection case wi
t
h sy
m
link
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t
6
0
44:
v
e
rif
y
th
a
t merges
e
xpected to abort actually
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
in
d
ex_has_changes(): avoid
a
ssuming
opera
t
ing on the_index
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
r
ead
-
cac
h
e
.
c: m
o
ve index
_
ha
s
_changes()
from merge
.
c
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-28
El
i
jah N
e
wre
n
t5407
:
fix test to cov
e
r intended arg
u
ments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-28
E
lijah Newren
apply
:
fix
g
r
a
m
m
a
r error in comment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next