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
Merge branch 'js/gc-repack-close-before-remove'
2019-01-10
Elijah Ne
w
ren
git-show-r
e
f
.
txt: fix order of fla
g
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
E
lijah Newren
gi
t
-re
b
ase
.
txt:
u
p
d
ate note abou
t
directory
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newren
fast-export: add
a --show-ori
g
in
a
l-id
s
o
ption to sh
o
w
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
fast-import:
r
emo
v
e unmaint
a
i
ned duplicate documentat
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
j
a
h
N
ew
r
en
fast-export: add --referen
c
e-exclu
d
ed-parents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah Newren
f
ast-export: en
s
ure we export reque
s
ted
r
efs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah N
e
wren
fast-
e
xport: when using p
a
ths, a
v
oi
d
c
o
r
r
u
p
t
str
e
am
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
fast-export: mo
v
e co
m
mit rewr
i
ting logic int
o
a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast
-
ex
p
ort:
a
void d
y
ing
w
h
en filtering by paths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fas
t
-export: use value
from correct
e
num
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
git-fast-expo
r
t
.
tx
t
: clar
i
fy mi
s
leading d
o
cum
e
ntatio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
j
ah Newren
g
i
t
-
fast-import
.
txt: fix documenta
t
ion for --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: con
v
ert sha1 to
oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
Newren
t6
0
3
6
,
t
604
3
: inc
r
e
a
se code coverage for fi
l
e colli
s
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Ne
w
r
e
n
m
e
rge-rec
u
r
sive: improve rename/rename(1to
2
)/add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
Newr
e
n
merge-recursive: use handle_
f
i
l
e_collisio
n
f
or add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
Newr
e
n
merg
e
-recursive:
improve ha
n
dling for rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
Newren
merge-rec
u
rsive:
f
ix rename/add
conflict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h Ne
w
re
n
merge-recursive: new fu
n
ction f
o
r b
e
tter colli
d
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
j
a
h Newre
n
merge
-
r
ecu
r
sive: increase marker length with
dept
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
t603
6
,
t
60
4
2: testcases
f
or rename co
l
l
i
sion of a
l
r
eady
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah
N
ewr
e
n
t6042: ad
d
tests for consistenc
y
in f
i
le collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Newren
fsck: move fs
c
k_head_li
n
k() to get_defau
l
t_heads(
)
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah
N
ewren
merge-recu
r
sive:
a
void sho
w
in
g
c
o
nflicts with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah
N
ewren
merge-recursive:
i
mprove auto-mergi
n
g m
e
s
sages with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
c
o
mmit: fix errone
o
us BU
G
,
'
mul
t
iple renames
on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-
r
ecursi
v
e: r
e
name merge_f
i
l
e_1(
)
and merge_content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
Newren
merge-recursive: remove
f
in
a
l rema
i
ni
n
g caller of m
e
r
g
e_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge
-
recursive:
avoid
w
rapper function when un
n
ecessar
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Ne
w
ren
merge-recursive
:
set paths correct
l
y when three-w
a
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
s
e
quencer: fix --allow-empty-messag
e
behavi
o
r, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newre
n
update
-
ref:
allow --no
-
deref w
i
th --stdi
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-
r
ef: fix type of u
p
date_f
l
ags variabl
e
t
o
m
a
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
lij
a
h
Newren
rerere:
avoid buffer
o
v
err
u
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
t4200:
d
emonstra
t
e rerere segfau
l
t
on specially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah N
e
wren
Remove
s
upe
r
fluous trai
l
ing
s
emicolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avoi
d
d
i
rectory rename detecti
o
n when
c
alling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah Newr
e
n
merge-recursive: add abili
t
y to turn off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newren
t3401
:
add another dire
c
tory r
e
name testcase f
o
r
r
ebas
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah N
e
wren
Remove
f
o
rwa
r
d declaratio
n
of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
compat/precompose_utf
8
.
h
:
use more
c
ommon include
g
ua
r
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
ren
u
rlm
a
tc
h
.
h: fix include gua
r
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elija
h
N
ewren
Move
d
efinition of enum
b
ranch_track from cach
e
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah New
r
en
a
l
loc: make al
l
o
c
ate_alloc_state and clear_alloc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lija
h
Newren
Add
m
issing includes a
n
d f
o
rwar
d
declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
git-upda
t
e-index
.
t
x
t: r
e
word
p
ossibly c
o
nf
u
sin
g
example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah New
r
en
t7406: av
o
i
d
usi
n
g
t
est_
m
ust_fai
l
for comm
a
nds other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah N
e
wren
t7
4
06: prefer test_*
h
e
l
per functions
t
o test -[f
e
ds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Eli
j
ah Ne
w
ren
t7406: a
v
o
i
d having git co
m
mands
u
pstream o
f
a pip
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newre
n
t7406
:
s
i
mpli
f
y b
y
using di
f
f --n
a
me-only instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7
4
0
6: f
i
x call that was fail
i
ng for the wro
n
g rea
s
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
E
lija
h
Newren
t
3
031:
u
p
d
a
te t
e
st
d
escription t
o
m
en
t
ion desi
r
ed
b
ehavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
l
ijah Ne
w
ren
rea
d
-c
a
che: fix directory/fi
l
e
c
onflict
handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
l
ijah
N
e
wren
t1015: demonstrate dir
e
ctory/file co
n
flict recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
merge-recu
r
sive: pre
s
e
r
v
e skip_worktr
e
e bi
t
when necess
a
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h N
e
wren
t740
5
:
verify 'merge
-
-
abort' works after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: add a
directory/s
u
bmodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
ja
h
Newren
t7
4
05: add a
file/sub
m
odule confli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
mer
g
e
: fix mis
l
ead
i
ng pre-mer
g
e check
doc
u
m
e
ntati
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
mer
g
e
-
recursive: enforce ru
l
e
t
h
at index match
e
s
head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
t604
4
:
add more testcases wi
t
h
s
taged changes before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newr
e
n
m
e
r
g
e
-
r
ecursi
v
e: fix assumpt
i
on that
h
ead tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
i
jah Newre
n
mer
g
e-r
e
cu
r
sive: make
sure when
w
e sa
y
we abort
t
hat
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t60
4
4: add a te
s
t
case for
index matchi
n
g
head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wre
n
t6036
:
a
dd a failed conflic
t
detection case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah
N
ewren
t6036:
a
dd lots of detail
fo
r
directo
r
y/file confli
c
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6042: add testcase covering long c
h
ains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
e
wren
t6042: a
d
d
t
estcase
c
ove
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
Elijah Ne
w
r
en
t6042: a
d
d testcase covering r
e
na
m
e/add/delete confli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a failed confli
c
t d
e
tection case with c
o
nflicti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t603
6
: add
a
failed conflict
detection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lija
h
Newren
t6036
:
add a failed conflict detection
case
w
i
th submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a failed confl
i
ct detection case with
s
ym
l
ink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6036: add a failed conflict d
e
t
e
ction case wit
h
symlin
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044
:
ve
r
if
y
that merges
e
xpected to
a
bort a
c
tually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newr
e
n
index
_
has_cha
n
ges()
:
avoid
a
ssuming
o
perating on the
_
index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
read-ca
c
he
.
c: move i
n
dex
_
has_changes() fro
m
merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t5407:
f
ix
test to cover i
n
t
ended
a
rguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
app
l
y:
fix gr
a
mma
r
error in
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
g
i
t
-
rebase--merge:
m
odern
i
z
e
"git-$cm
d
"
to "g
i
t
$cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix
u
se of str
a
tegy
options wit
h
intera
c
tive
rebas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newr
e
n
t34
1
8
: add testcase showing
p
roblems with rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newren
gi
t
-rebase: make
--a
l
low-empt
y
-
m
es
s
a
ge th
e
de
f
ault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Ne
w
r
en
t3401:
add directory
r
ename test
c
ases
f
or re
b
ase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
j
ah Newre
n
git-re
b
ase
.
txt:
document
b
ehav
i
o
r
al d
i
fferen
c
e
s between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
directory-rename-detecti
o
n
.
txt
:
t
e
chnical docs on ab
i
litie
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wr
e
n
git-rebase
.
txt: ad
d
ress confusion between
--n
o
-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-
r
eba
s
e: error out
w
he
n
incompatible
o
ptions
p
assed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
t
3422: new testcases for c
h
ecking w
h
en in
c
ompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-
r
ebas
e
.
sh: update help me
s
sag
e
s
a
bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah New
r
en
git-
r
e
bas
e
.
txt: document incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah N
e
wren
Re
l
Notes 2
.
18: clarify where directory rename d
e
tection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h New
r
en
m
erge-re
c
ursive: add poin
t
er
abo
u
t unduly complex look
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
N
e
wren
merg
e
-
r
ecursive: rename con
f
lict_rename_*()
f
amily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah
N
e
w
ren
m
e
rge-r
e
cursive: clarify the
r
ename_
d
ir/RE
N
A
ME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newr
e
n
merge-recursiv
e
: align labe
l
s
w
i
th th
e
ir res
p
ective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah
Newren
mer
g
e-recursive:
f
ix numerous argument al
i
gnment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah N
e
wr
e
n
m
erge
-
r
e
cursi
v
e:
f
ix
m
iscell
a
neous gr
a
m
m
ar err
o
r
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
l
i
ja
h
N
e
w
re
n
Re
l
N
otes: remove
duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t603
6
:
prefer test_when_f
i
nished to manua
l
c
l
e
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next