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
diff-parseopt: correct variable types that are used by parseopt
2019-01-10
Elijah Newren
g
i
t-
s
how-ref
.
txt: f
i
x
o
rder of fl
a
gs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
E
l
i
jah
Newren
git-rebase
.
txt
:
upda
t
e note about
directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah
N
e
wren
fast-export: add a --show-original
-
i
d
s
o
p
t
i
o
n
to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
fast-import: remove
u
nm
a
intained duplicate
d
ocumentat
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
en
fast-expor
t
: add --reference-ex
c
luded-parents option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fa
s
t-
e
xport: ens
u
re we export reques
t
ed refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
fas
t
-export:
w
hen using paths, avoid
corru
p
t stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah New
r
en
fast-export: move commi
t
rewrit
i
ng logic into a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
fast-expo
r
t: avoid
d
y
i
ng w
h
e
n
fil
t
e
r
ing by
paths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah N
e
wr
e
n
fast-exp
o
rt: use va
l
ue from correct
e
num
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lija
h
Newren
gi
t
-fast
-
export
.
txt: clarify mislead
i
n
g
docume
n
tation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
g
i
t
-f
a
st-
i
m
p
or
t
.
txt
:
fix
d
o
c
umentat
i
o
n
for
--quie
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
fast-e
x
port: convert sha
1
t
o
oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newre
n
t6036, t60
4
3: i
n
crease cod
e
covera
g
e
for file collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
w
re
n
merge-recur
s
ive:
improve rename/
r
ename(1to2)/add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
merge-recursive: use handle_file_col
l
ision
f
o
r
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah Newren
me
r
ge-rec
u
rsive: i
m
p
rove
h
andl
i
ng for rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
m
e
r
g
e-recur
s
ive:
f
ix rena
m
e/add
c
onf
l
ict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
m
e
rge-recursive:
new functi
o
n for
b
etter
c
oll
i
ding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newre
n
merge-rec
u
r
sive: in
c
r
e
ase marker len
g
th with de
p
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
lijah Newre
n
t6036, t6042: testcases for rename
c
oll
i
sion of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah N
e
w
ren
t
6
042: add tests for consistency in fi
l
e
c
oll
i
sio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah N
e
wr
e
n
fsck: m
o
ve fsck_head_
l
ink() to get_default_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge-
r
ecursive: avo
i
d
showing conflicts with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah N
e
wren
merge-recursiv
e
: imp
r
ove auto-
m
erging messages with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
El
i
j
ah
N
ewr
e
n
co
m
mit: fix er
r
oneous BUG,
'
mul
t
iple
r
enames on t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elija
h
N
ewren
merge-recursive:
r
ename merge_file_1() and
merge_cont
e
nt()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-r
e
c
u
rsive
:
remove f
i
nal
re
m
aining caller
o
f merg
e
_
file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recursiv
e
: avoid
w
r
a
pper functi
o
n when un
n
ecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elij
a
h Newren
merge-recurs
i
ve: set pat
h
s cor
r
ectly when three-w
a
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
sequencer: fix
--allow-empty-message b
e
ha
v
ior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah New
r
en
update-
r
ef: allow --no-deref with --st
d
i
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elij
a
h N
e
w
r
en
update-ref: fix type of up
d
ate_
f
lags variable
to m
a
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
El
i
jah Ne
w
r
e
n
r
e
r
e
re: avoid buf
f
e
r
ove
r
run
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah
Newren
t4200: d
e
monstr
a
te rerere
s
egf
a
ult on
s
p
ecially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
E
lijah
Newren
R
e
move su
p
e
r
flu
o
u
s
trailing se
m
i
c
ol
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newren
a
m
: avoid
directory
rename d
e
tection whe
n
c
a
l
l
i
n
g
r
ecursiv
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
merg
e
-recu
r
sive: add ability to
turn off d
i
rectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elija
h
N
e
w
ren
t3401: add ano
t
her di
r
ectory ren
a
me testcase for r
e
base
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
li
j
ah
N
e
w
ren
Remove forw
a
rd decla
r
a
t
ion of
an en
u
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah
Newr
e
n
compat/
p
recompose_utf8
.
h: use more common include guar
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
urlmatch
.
h
:
fix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move
defin
i
tion of enum
branch
_
trac
k
from cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h N
e
w
ren
a
lloc: make all
o
cate_
a
lloc_stat
e
and clear
_
alloc_sta
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h Newren
Add missin
g
inc
l
udes
and forward
d
e
clarat
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
g
i
t-update-index
.
txt: reword possi
b
ly
con
f
using example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: avoid usi
n
g test_must_fail for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ewren
t7406:
p
re
f
er test_* helper functions to test -[fe
d
s]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: avoid having git co
m
mands upstream of a
pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: simpli
f
y
b
y using diff --name-o
n
l
y inst
e
ad of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
j
ah Newren
t7406: fix call tha
t
was failing for
the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t3
0
31: updat
e
t
est description
to men
t
ion
d
e
s
ire
d
behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Eli
j
ah N
e
wren
read-cache:
f
ix directory/file conflict handlin
g
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
li
j
ah
N
e
w
ren
t1015: demonstrate
d
irectory/file
conf
l
i
c
t recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
me
r
ge-recursive: pre
s
erve skip_worktree bit when necess
a
ry
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: verify '
m
erge
--a
b
ort' works after
subm
o
d
u
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
t7405: add a directory/sub
m
odule co
n
f
l
ict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: add a
f
il
e
/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
mer
g
e: fix m
i
sleading pre-merge c
h
eck documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
merge-
r
e
c
ursiv
e
:
e
nforce rule t
h
at index matches he
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
t6
0
44: a
d
d mor
e
t
e
stcases with s
t
age
d
cha
n
ges before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-rec
u
rsi
v
e: fix assu
m
ption
that head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-rec
u
rsive: m
a
ke su
r
e when
we say we ab
o
rt that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: ad
d
a testcase fo
r
index matching head,
w
h
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6036: add
a failed conflict detection case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elija
h
N
e
w
r
e
n
t6036
:
add
l
ots of deta
i
l
for directory/fil
e
con
f
licts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t6042: add testcas
e
covering long c
h
ain
s
of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h
N
e
w
re
n
t6042:
a
dd testcas
e
coverin
g
r
ena
m
e/
r
ename(2t
o
1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t60
4
2: add
testcase
c
overing r
e
name/add/d
e
l
ete c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t603
6
: add a fail
e
d conflic
t
d
etection case with c
o
nflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a failed conflic
t
detecti
o
n case w
i
th
subm
o
dule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: ad
d
a fa
i
led confl
i
ct detection
case with submo
d
ule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036:
add a
failed conflict
de
t
ection case wi
t
h
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ija
h
Newren
t
6
036: add a failed conflict detection case
w
ith s
y
ml
i
nk
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6044:
verify that merg
e
s ex
p
e
c
ted to abo
r
t ac
t
ually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
inde
x
_has_chang
e
s(): avoid assu
m
ing
o
p
e
rat
i
n
g on
t
he_i
n
d
e
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah
N
ewren
read-cache
.
c:
move index_has_c
h
anges() from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t5407: fix test to
co
v
er intend
e
d argum
e
nts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elij
a
h Newren
a
pply: fi
x
g
rammar e
r
ror in
comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
gi
t
-
r
ebas
e
--
m
e
r
ge:
m
oder
n
ize "git-$c
m
d
"
to "git
$
cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
Fi
x
use
o
f strategy o
p
t
ions with i
n
teractive r
e
bases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Ne
w
ren
t3418: add
t
est
c
a
se
showin
g
problems with rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase:
m
a
k
e --allow-empty-mess
a
ge the
default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
t3401: a
d
d
d
i
recto
r
y
r
ename testcases fo
r
re
b
a
s
e and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
N
e
w
re
n
git-r
e
base
.
t
x
t: docum
e
n
t
behavioral differ
e
nce
s
b
e
tween
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
directory-rename-det
e
ct
i
on
.
txt: technical docs
o
n
abili
t
ies
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah
N
e
w
ren
git-r
e
base
.
txt:
a
ddress confusio
n
between --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
gi
t
-rebas
e
: error
o
ut when incompa
t
ible opti
o
ns
p
a
ssed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ija
h
Newren
t342
2
: new testcases for checking when incompatible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
l
ijah Newren
gi
t
-rebase
.
s
h: u
p
date he
l
p messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
g
it-reba
s
e
.
txt: doc
u
ment
i
ncompatible o
p
tion
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
E
l
ijah Newr
e
n
RelNot
e
s 2
.
18: clarif
y
where
d
irect
o
ry
r
e
n
ame detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h Newren
m
e
rge-
r
ecursi
v
e: add pointer about und
u
ly com
p
lex
l
ooking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah
Ne
w
r
e
n
m
e
rge-recursiv
e
:
rename confli
c
t_r
e
name_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursiv
e
: clarify
t
he rename_dir/RENA
M
E_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
merge-recurs
i
ve: ali
g
n l
a
bel
s
with their resp
e
c
tive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lij
a
h Ne
w
r
e
n
merge-recursive: fix numerous argument align
m
e
n
t issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Ne
w
ren
merge-recursive:
f
i
x miscel
l
ane
o
us
grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
R
elNo
t
es: re
m
ove duplicate
r
eleas
e
note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t603
6
:
p
refer
t
est_when_finished
t
o
manua
l
clean
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next