repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fast-import: support 'encoding' commit header
2019-05-14
E
lij
a
h Newr
e
n
fast-i
m
por
t
: supp
o
rt 'encodi
n
g' commit
h
ead
e
r
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-05-14
Elijah Newr
e
n
t93
5
0: fix e
n
coding test to actually
test ree
n
coding
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah
Newren
fast-i
m
po
r
t: fix erroneous handling of get-
m
ar
k
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Eli
j
ah Newren
fast-import: onl
y
a
l
low cat-b
l
o
b requests where it
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
E
l
ijah Newren
fast-import: c
h
eck most prominen
t
commands first
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Newren
git-fast-import
.
t
xt: fix wording
about where ls
c
ommand
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-04-01
Elijah Ne
w
ren
t93
0
0: de
m
onstrate bug with get-mark and empt
y
orphan
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-21
E
lijah
Newren
merge-opti
o
ns
.
txt:
c
orrect wordin
g
o
f
--no-commit option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-14
El
i
jah
N
e
w
ren
git-rebase
.
txt: up
d
ate to reflect merge now imple
m
ented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-02-08
Elijah New
r
en
log,di
f
f-tree: add --
c
ombined-
a
ll-path
s
option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah
Newren
git
-
show-r
e
f
.
t
xt:
f
ix order
o
f
f
l
a
gs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
El
i
jah N
e
wr
e
n
rebase: impl
e
ment --merge
v
i
a t
h
e interactive machine
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: de
f
i
n
e
linearization ordering and enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ij
a
h Newren
g
i
t-legacy-rebase: simplify u
n
n
e
c
e
ssa
r
y
t
ri
p
ly
-
nested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newr
e
n
git-rebase, sequencer: extend --quiet
o
ption fo
r
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
am, rebase--
m
erge: do not ov
e
rlook --skip'ed
c
ommits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah Newren
t5
4
07:
a
dd a test dem
o
nstrating how interac
t
iv
e
h
a
ndles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase
:
fix
i
nc
o
mpatible
o
p
t
ions err
o
r messag
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
rebase: m
a
ke builtin and
l
ega
c
y script error messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah N
e
wren
git-re
b
a
se
.
txt: u
p
date
note about
dir
e
ctory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h N
e
w
ren
fast-
e
xp
o
rt
:
a
dd
a
--sho
w
-
original
-
ids option t
o
s
h
ow
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fas
t
-imp
o
rt: r
e
move unmaintained du
p
licate
d
o
c
umentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newren
fast-export
:
add
-
-reference-excluded-pare
n
ts option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah
N
ewren
fa
s
t-exp
o
rt
:
ensure
we ex
p
ort requested refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
f
a
s
t
-export: when us
i
ng pat
h
s, avoid corrupt str
e
am
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah
N
ewre
n
fast-
e
xport: move c
o
mmi
t
r
ewritin
g
logic
i
nto a funct
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
en
fast-e
x
port: avoid
dy
i
ng wh
e
n
f
iltering by
p
a
ths
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
fast-e
x
port: use value from
c
orrect enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
git-fast-exp
o
rt
.
txt: clarify misleading do
c
ument
a
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah
N
ewren
git-fas
t
-impor
t
.
txt: fix documen
t
a
tion for
--quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
e
wren
f
a
st-export: convert sha1
t
o
oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newren
t6036,
t
6043
:
i
ncrease code coverage for file collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
merge-recurs
i
ve:
impro
v
e renam
e
/ren
a
me(1to2)/add[
/
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recu
r
sive:
u
se handle_f
i
le_collis
i
o
n
for a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah Newren
me
r
ge
-
recursive: improve hand
l
ing for rename
/
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ew
r
en
m
e
rge
-
recursive:
fi
x
rename/a
d
d conflict handlin
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
New
r
e
n
merge-recur
s
i
ve: ne
w
func
t
i
o
n for
b
etter co
l
l
i
d
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lij
a
h Ne
w
ren
merge-recurs
i
v
e:
increase marker
l
eng
t
h
with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newre
n
t6036, t6042: test
c
ases for rename coll
i
sion of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
t6
0
4
2
: add
tests for consistency in
f
ile collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Eli
j
ah Newr
e
n
fsck: m
o
ve fsck_head_link
(
) to get_defa
u
lt_
h
eads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newr
e
n
merge-recursive: av
o
id showing conflicts
w
ith me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newre
n
m
erge-rec
u
rs
i
v
e
:
i
mprove auto-merging me
s
s
ages with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
c
omm
i
t
:
fix erroneous BUG,
'multiple
r
e
names on t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
i
jah
Newren
mer
g
e
-
re
c
u
r
sive: ren
a
m
e
merge_file_1(
)
and merge_content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merg
e
-recursive: remove
final re
m
ai
n
ing
caller of m
e
rge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
jah N
e
wren
merg
e
-recu
r
sive:
avoid wrapper fu
n
ction when unnecessar
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
ijah Newren
merge-recursive: set p
a
t
h
s
co
r
re
c
tly
w
hen three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah
Newren
sequen
c
er:
fix -
-
a
l
low-em
p
ty-message beh
a
vior,
make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah N
e
wren
update-re
f
: allow --no-de
r
ef with --st
d
in
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elij
a
h Newren
updat
e
-
r
ef:
f
ix type of update
_
flags variable to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah N
e
wren
rerere: avoid buffer overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elij
a
h Newren
t4200: demonstrate rerere
s
egfault on speciall
y
crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elija
h
N
ewren
Remove sup
e
rfluo
u
s
t
railing semic
o
l
on
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avoid di
r
ectory ren
a
me d
e
tect
i
on when calling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newr
e
n
m
e
rge-rec
u
rs
i
ve: ad
d
ability to turn
off
d
irec
t
o
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
t
3401: add anoth
e
r dir
e
ctory rename testcase
for rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
Remove forw
a
rd declaration of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h Newren
compat/precom
p
ose_utf8
.
h:
use
m
ore comm
o
n include g
u
ard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
ren
urlmatch
.
h
: fi
x
include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move definition of enum branch_tr
a
ck from cac
h
e
.
h
to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
alloc: make
allocate_alloc
_
sta
t
e and clear_al
l
o
c
_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
ah Newren
Ad
d
m
issing i
n
clud
e
s and
f
orward decla
r
a
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
git-u
p
date-index
.
txt: r
e
word possibly
c
onfusing examp
l
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Ne
w
ren
t7406: avoi
d
us
i
ng test
_
must_
f
ail f
o
r commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7
406:
p
ref
e
r
te
s
t_*
h
elper functions to test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: avoid having git command
s
upstream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah
N
e
wren
t7
4
06: simplify by using diff --
n
ame-onl
y
inste
a
d of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h
Newren
t7406: fix call tha
t
w
as f
a
iling
f
o
r
the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t
3
031: update test descrip
t
io
n
to men
t
ion desir
e
d behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elij
a
h N
e
wren
read-cache: fix directo
r
y/file co
n
flict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah New
r
en
t1015:
demonstrate direc
t
ory/file con
f
lict
reco
v
ery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
E
l
ijah Newr
e
n
merge-recursive: preserve ski
p
_worktree bit wh
e
n necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
t7405: verify 'merge --abo
r
t' works after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t74
0
5:
a
d
d a
d
irect
o
ry/submodule con
f
lict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah New
r
en
t74
0
5: ad
d
a file/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ija
h
Newren
merge: fi
x
mi
s
lea
d
ing pre-merge check document
a
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
merge-recur
s
ive: enforce rule that index
matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044
:
add
m
ore testcases
w
ith sta
g
ed ch
a
n
g
es
before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah N
e
wren
merge-recursive: fix assumpti
o
n t
h
at head
t
ree
bei
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
merge-recursi
v
e
: make sure when we say w
e
a
b
ort
t
hat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newren
t6
0
44:
a
dd a
t
es
t
case for in
d
ex matching head, whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
N
e
wren
t6036:
ad
d
a
f
ailed conflict det
e
ction c
a
se: r
e
gula
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newren
t6036: add lots of
detail fo
r
d
irectory/file co
n
f
l
i
c
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah
N
ew
r
en
t6042:
add
t
estcase covering lon
g
chains of renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t6042:
a
dd
t
e
stcase cove
r
in
g
ren
a
me/rename(2t
o
1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah N
e
wren
t6042:
a
dd
testcase cov
e
ring rena
m
e/a
d
d/d
e
lete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a failed co
n
fl
i
ct detection
case with conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah N
e
wren
t
6036: add a fai
l
ed conflict detection
c
as
e
with
s
u
b
module
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah
Newre
n
t60
3
6: add
a
failed
c
onfl
i
c
t
detection c
a
se with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
0
36
:
add a fail
e
d conflict detection c
a
se with s
y
mli
n
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
60
3
6:
a
dd a failed confli
c
t
d
et
e
c
tio
n
case with s
y
mlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
t6
0
44:
v
erify that
m
erges ex
p
ected
t
o abort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
index_
h
as_chan
g
es(): avoid assuming operating on th
e
_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
read-cache
.
c: m
o
v
e index_h
a
s
_
changes() from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
l
ijah Newren
t54
0
7: fix test to cover intended argumen
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Ne
w
r
en
apply
:
fix grammar error in
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
git-rebase--merge: modernize
"
git-$cmd" t
o
"git $c
m
d"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
Fix u
s
e
o
f
strategy opt
i
ons w
i
th interactive re
b
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
t
3
418: add testcase showing pr
o
b
l
ems wit
h
rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next