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
archive-tar: report wrong pax extended header length
2019-02-14
Elijah
Ne
w
ren
git-r
e
base
.
txt: update t
o
reflect merge now impl
e
mented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah N
e
wren
g
it-show-ref
.
txt: f
i
x order of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elija
h
N
e
w
r
en
re
b
ase: implement --
m
erge
via th
e
interactive machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
ah Ne
w
ren
r
e
base:
def
i
ne lineari
z
ation
ordering
a
nd enforc
e
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-legacy-reb
a
s
e: simplify unnec
e
ssary triply-
n
ested i
f
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah New
r
e
n
git-rebase, sequen
c
er: 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--merge
:
d
o
not ov
e
rlook --skip'e
d
commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah N
e
wren
t5407: add a
tes
t
d
emonstrat
i
ng
h
ow interactive handles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Eli
j
ah Newren
re
b
as
e
:
f
ix incompatible
options error mess
a
ge
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
re
b
ase:
make bu
i
ltin and legacy
s
cri
p
t error mes
s
ages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah New
r
en
gi
t
-rebase
.
t
x
t: update not
e
abo
u
t direct
o
ry rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah
N
ewren
fast-e
x
p
ort:
add a
-
-show
-
original-ids
o
p
tion to
show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
a
h
N
ewren
f
a
s
t-import: remove unmaintained duplicate documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah N
e
wr
e
n
fast-exp
o
rt: a
d
d --refere
n
ce-excluded-parents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Ne
w
ren
f
a
st-expor
t
:
e
nsure we e
x
por
t
requested refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newre
n
f
a
s
t
-export: when using paths, avoid
c
orrupt strea
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fa
s
t-export: move comm
i
t rewriting
l
o
g
i
c into a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
fast-export: avo
i
d dying when fi
l
terin
g
by paths
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ij
a
h Newre
n
fast-
e
xport
:
use
v
alue from corre
c
t
e
num
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah
Newren
git-fast-e
x
p
ort
.
txt: clarify mislea
d
in
g
docu
m
entation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah
N
e
wren
git-fast-import
.
txt: fix
d
o
cu
m
e
ntation for --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
e
wren
fast-export
:
con
v
ert
s
h
a
1 to o
i
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t6036, t
6
043
:
i
n
crease code cove
r
age
f
or
f
ile colli
s
i
o
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
i
jah Newren
merge-recursive: i
m
prove
r
ename/rename(1to2)/add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewre
n
m
e
rge-recursive: use handle_
f
ile_collision for add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h
Ne
w
ren
merg
e
-r
e
cursive: imp
r
ove handling
f
or renam
e
/
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
e
r
g
e
-rec
u
rsive: fix rename/
a
dd confl
i
ct handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah New
r
en
mer
g
e-recu
r
sive: new funct
i
on f
o
r better colliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah N
e
wren
merge-recu
r
sive: in
c
rease ma
r
ker length wi
t
h depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
t6036, t6042:
t
est
c
ases f
o
r rename collis
i
on of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
a
h
Newren
t6042: add tests
for
consistency
in f
i
le
c
ollision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah
N
ewre
n
f
s
ck: mov
e
fs
c
k_head_link
(
) t
o
get_defaul
t
_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Eli
j
ah New
r
en
merge-recu
r
sive:
avoid showing con
f
lict
s
w
ith
m
er
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merg
e
-recursive: impro
v
e auto-merging
m
essa
g
es with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
co
m
mit: fix
e
rr
o
neo
u
s BUG, 'mult
i
p
le re
n
ames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newr
e
n
merge-rec
u
rsi
v
e
: rename merge_file_1() and
m
erge_con
t
ent()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
j
a
h
N
ewren
mer
g
e-recursive: remove f
i
n
al remaining call
e
r of
merge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recur
s
ive
:
avoi
d
wrapp
e
r functi
o
n
w
hen unn
e
c
e
ssary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
me
r
ge-recursive: se
t
p
a
ths corre
c
t
l
y
w
h
en thre
e
-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
seque
n
cer
:
f
ix --allow-empty-me
s
sage behavior, m
a
ke
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
u
p
date-ref: a
l
low --no-de
r
ef
w
i
th --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-ref: fix type o
f
upda
t
e_flags
v
ari
a
ble to matc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
El
i
jah N
e
wren
rerer
e
: avo
i
d
buff
e
r overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
l
ij
a
h
Newren
t42
0
0: demonstrate rerere segf
a
u
l
t
on speciall
y
crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah
Newren
Remo
v
e super
f
lu
o
u
s t
r
a
il
i
ng se
m
icolo
n
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lij
a
h New
r
en
am: avoid directory re
n
ame detection
wh
e
n callin
g
recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah N
e
wr
e
n
m
e
rg
e
-recursive: add ability to
t
ur
n
o
f
f
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah
N
ewren
t3401:
a
dd ano
t
her di
r
ec
t
ory rename testcase for
r
ebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Remove forward declaration of
a
n
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
a
h
Newren
compat/precompose_utf8
.
h: use more common
i
nc
l
u
d
e guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newre
n
urlmatch
.
h
: fix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newre
n
Move
defini
t
ion of e
n
um branch_
t
rack from
c
ache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ija
h
Newren
alloc: make all
o
cate_
a
lloc_state and c
l
e
a
r_alloc_stat
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lij
a
h Newren
Add mi
s
sin
g
includes and forw
a
rd declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newren
git-
u
pdate-index
.
txt: r
e
word poss
i
bly confusin
g
example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406:
a
v
oid usi
n
g test_m
u
st_fail for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
ja
h
Newren
t7406:
p
re
f
er test_* helper functions to test
-[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newr
e
n
t7406: avo
i
d having gi
t
com
m
ands up
s
tream of
a
p
ip
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewren
t7406: s
i
mplify
by
u
si
n
g diff --nam
e
-only
i
n
stead o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: fix call tha
t
was failing for th
e
wrong reaso
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah
Newren
t3031:
u
pdate
t
est descriptio
n
to mention de
s
ired beha
v
ior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
El
i
jah Newren
read-cache: fix directory/file conflict handling
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t
1
015:
d
emonstrate directory/file con
f
lict recov
e
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
merge-recurs
i
v
e
: preserve s
k
ip_w
o
rktre
e
bit when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah New
r
en
t7405
:
v
erify 'me
r
ge
--abort' works after su
b
module
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah N
e
wren
t7405:
a
dd
a direc
t
ory/sub
m
o
dule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
t74
0
5: a
d
d a fil
e
/submodul
e
con
f
lict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge: fix mi
s
le
a
d
i
ng pre-merge c
h
eck documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
j
ah Newren
merge-r
e
cursive: e
n
force rule t
h
at i
n
dex matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
t6044: add mo
r
e testcases w
i
t
h
stag
e
d chan
g
es befo
r
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
erge-
r
e
c
urs
i
ve: fix assump
t
ion
t
hat
he
a
d tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h N
e
w
r
en
merge-recursive:
m
ake sur
e
when we say we
abor
t
tha
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
6044: add a testcase
f
or index
m
a
t
ching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah
Newren
t60
3
6: add a
f
a
iled conflict detectio
n
case
:
regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
E
l
ijah New
r
en
t6036: add l
o
ts
of de
t
ail for directory/
f
ile
c
onflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
en
t6042: add tes
t
c
a
se covering long chains of
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
w
ren
t6042: add
t
e
s
tcase covering re
n
ame/rename(2to1)/
d
el
e
te
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
e
n
t6042:
a
dd testcase
c
over
i
ng
renam
e
/add/delete
c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
t6036: add a
f
a
iled conf
l
ict detecti
o
n case wi
t
h conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6
0
36: add
a
f
a
iled c
o
n
f
l
i
c
t d
e
tec
t
ion case
w
ith sub
m
odule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t6036: a
d
d
a
fa
i
led conflict d
e
tect
i
on case wit
h
submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
t6036: add a failed c
o
nflict detecti
o
n case
wi
t
h
s
ymlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6036: add a
fail
e
d conflict detection case
w
i
t
h
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Ne
w
ren
t6
0
4
4
:
verif
y
that merges e
x
pected to
a
bort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ija
h
Newren
ind
e
x
_has_chan
g
es(): avoid assumin
g
operating
o
n the_
i
nde
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lija
h
Newren
read-cache
.
c
:
move i
n
dex_has_changes()
f
r
o
m me
r
g
e
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah
Newren
t
5
4
0
7: fix test to c
o
v
e
r
intend
e
d ar
g
ument
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply:
fix gramma
r
e
rror
in
c
o
mment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
g
i
t-rebase--me
r
ge:
mo
d
e
r
nize "git-$cmd" to "g
i
t
$cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix us
e
of strateg
y
options with i
n
teractive reba
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ija
h
N
e
wren
t3
4
18: add testcase showing problems wi
t
h rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
git-re
b
ase: m
a
ke --allow-empty-message the
d
e
fault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3401: add d
i
rectory ren
a
me testcases for reba
s
e a
n
d
am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newren
git-r
e
base
.
txt: document behavi
o
ra
l
differences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
directo
r
y-rename
-
detection
.
txt: technica
l
docs on abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
git-rebase
.
txt: address co
n
fusion between --no-ff v
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah
Newr
e
n
git-reb
a
se: erro
r
out w
h
en
incompatible options passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
t3422
:
new tes
t
c
a
s
e
s for checking whe
n
incomp
a
tible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
lij
a
h Newren
git-rebase
.
sh:
update help messages
a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Eli
j
ah
Newren
gi
t
-reba
s
e
.
txt: d
o
cument inco
m
patible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next