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 'rb/hpe'
2018-12-09
Elijah Newren
git-reb
a
se
.
txt: update note
about directory rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newren
fast-export: add
a -
-
show-original-ids o
p
tion
to
show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Newren
fast-im
p
ort:
r
em
o
ve unmaintained duplicate documenta
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: a
d
d --reference-excluded-parents
o
p
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah New
r
en
fast-export: e
n
sure we e
x
port requested refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elij
a
h Newren
fast-
e
xport: when us
i
ng pat
h
s
, avoid corrupt strea
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: move c
o
m
m
i
t
rewri
t
ing logic into a function
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-export: avoid d
y
ing when fil
t
ering by paths and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
j
ah Newren
fast-export: use value from c
o
rre
c
t enu
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
g
it-fast
-
e
xpor
t
.
txt:
clarify misleading documentation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
g
i
t-fast-impo
r
t
.
txt: fix doc
u
mentation for --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newr
e
n
fast-export: convert s
h
a
1
to oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newre
n
t
6036,
t604
3
: increa
s
e cod
e
cover
a
ge fo
r
file collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
wren
m
e
rge-
r
ecursive: improve rename/rename(1to2)
/
add[/ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merg
e
-recursive:
use handle
_
file_collision for add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
erge-recur
s
ive: impro
v
e handling for re
n
am
e
/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Ne
w
ren
m
e
rge-recursiv
e
: fix
r
ena
m
e/add conflict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
wren
merge-r
e
cur
s
ive: ne
w
func
t
ion for bett
e
r
c
oll
i
din
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
me
r
ge-
r
ecursive: increase
marker len
g
th with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h New
r
en
t6036,
t
6
0
42: tes
t
cases for rename coll
i
s
i
o
n
of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
t
6
042: add tests for consi
s
t
e
ncy in f
i
l
e
collisio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elij
a
h Newren
fsck: move fsck_
h
e
a
d_link() to get_default_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
E
lijah Newr
e
n
merg
e
-recursiv
e
: avoid show
i
ng conflict
s
with me
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah New
r
en
merg
e
-recursive
:
impr
o
ve auto-m
e
rging mess
a
ges wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
E
l
ijah Ne
w
ren
co
m
mit:
fi
x
erroneous
B
UG, 'mu
l
tiple renam
e
s on
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
l
ijah Ne
w
ren
m
e
r
g
e-rec
u
rsive
:
re
n
a
m
e
m
e
rge_
f
ile_1()
an
d
merge
_
c
onten
t
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah N
e
wren
merge
-
rec
u
rsive:
r
emove final
r
emaining call
e
r o
f
merge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-rec
u
rsive: a
v
oi
d
w
r
apper
functio
n
wh
e
n u
n
n
ecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah New
r
en
merge-rec
u
rs
i
ve:
set
paths corr
e
ct
l
y when t
h
ree-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
seque
n
ce
r
: fix --allow-empty-me
s
sag
e
behavior,
m
a
ke
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah New
r
en
upda
t
e-ref: a
l
lo
w
--no-dere
f
w
ith --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
E
lijah Newren
update-ref: fix type
o
f update_
f
lags variable to
match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah
N
e
wren
rerere: avoid
b
uf
f
er o
v
err
u
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
t
4
200: demonstrate rerere
s
egfault
o
n
s
p
e
cial
l
y crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Eli
j
ah Newren
Remove
s
u
p
e
rf
l
uous trailing
s
emicol
o
ns
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avoid directory ren
a
me de
t
e
c
tion whe
n
calling re
c
ursi
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah
Newren
merge-recur
s
ive: add ability to turn off directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newr
e
n
t3401: add another directory re
n
a
m
e testcas
e
for r
e
bas
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah
Newren
Rem
o
ve f
o
rward
d
eclar
a
tion of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah New
r
en
comp
a
t/
p
re
c
o
mp
o
se_utf8
.
h: use m
o
r
e common
i
nclu
d
e guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
urlmatch
.
h
:
f
ix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Move definition of
enum
branch_track from cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
ewren
allo
c
:
make alloca
t
e_alloc_sta
t
e and clear_al
l
oc_
s
tate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
ja
h
Newr
e
n
Add missin
g
includes and
f
or
w
ard declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elij
a
h Newren
git-up
d
ate-index
.
tx
t
:
r
eword possibly c
o
nf
u
sing exampl
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406:
a
v
oid using t
e
st_mu
s
t
_
fail
f
or commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
j
a
h N
e
wren
t
7
406: prefer test_* helper func
t
ions to test -[feds
]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah N
e
wren
t7406: avo
i
d having git
c
om
m
ands ups
t
ream of a pip
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t740
6
: si
m
plify
b
y using
dif
f
--name-o
n
ly instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lij
a
h
Newren
t7406: fix
c
a
ll
t
hat was fa
i
ling fo
r
th
e
wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
E
lija
h
New
r
en
t3
0
31: upda
t
e test de
s
cripti
o
n to mention
de
s
ired b
e
havior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah New
r
e
n
read-ca
c
he: fix
d
irectory/fi
l
e
c
onfl
i
ct hand
l
ing in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elij
a
h Newren
t1015
:
d
emonstrate directory/file conflict recov
e
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
merge-
r
ecurs
i
v
e: pres
e
rve skip_work
t
ree bit when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t74
0
5: verify 'merg
e
-
-
ab
o
rt'
w
o
rks after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah New
r
e
n
t7405: add a directory/
s
ubmodule co
n
flict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
t7405: add a file/submodule c
o
nflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge:
fix misleading pre-merge check
d
oc
u
mentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
N
ewren
m
e
r
g
e-recursive:
e
n
for
c
e
r
ule that index ma
t
ches hea
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
t6044: ad
d
m
o
re tes
t
cases with staged chang
e
s be
f
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
i
jah Newren
merge-recu
r
s
ive: fix a
s
sumption that head tree bei
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newren
merge-r
e
cursive: make sure when
w
e say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h
Newren
t6044: add a testcase for index matching
h
ead
,
wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t60
3
6: add a f
a
iled confli
c
t det
e
ction case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newren
t6036
:
add lot
s
of deta
i
l for
d
irectory/file conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t60
4
2: add testcase
c
overing long
chains of r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewr
e
n
t
6
042: add testcase cover
i
ng
r
ename/ren
a
me
(
2to1)/d
e
lete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
e
w
r
en
t6042:
add test
c
ase covering r
e
n
a
me/add/
d
elete co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t
6
036: add
a
failed confli
c
t detec
t
ion case
w
i
th con
f
l
i
c
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
t
6036: add
a
f
a
iled c
o
nflict
d
etection case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Ne
w
ren
t6036:
a
dd
a
f
a
iled conflict detection c
a
se
with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t60
3
6: a
d
d a failed
conflict detection c
a
s
e
with sym
l
i
nk
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah Newren
t
6
03
6
:
a
dd a failed
conflict
d
etection case with
s
ymlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t60
4
4: verif
y
th
a
t merges expect
e
d to ab
o
r
t actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah New
r
e
n
index_has_changes()
:
avoid assuming opera
t
in
g
o
n the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
read-cache
.
c: move index_h
a
s
_
ch
a
nges() from me
r
ge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elij
a
h Newren
t
5407
:
fix test to cover intended argum
e
nts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
a
pply: fix g
r
a
mmar error in c
o
mment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newr
e
n
git-reb
a
se--m
e
r
ge: modernize "gi
t
-$
c
m
d
" to "git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
Fix use of stra
t
egy options with interactiv
e
re
b
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t
3
418: a
d
d
testc
a
se showin
g
problems with r
e
base -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
gi
t
-rebase: make -
-
allo
w
-empty-message the def
a
ult
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newre
n
t3401:
a
dd direct
o
ry rename te
s
tcase
s
for rebase and
a
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newr
e
n
git-
r
ebase
.
txt:
d
ocume
n
t behavioral diffe
r
ences
between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
New
r
en
dir
e
ctory-rename-detection
.
t
x
t: technical doc
s
on abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
git-rebase
.
txt: address confusion between --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase: error out
w
hen
incompatib
l
e options
p
assed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t
3
422: new testc
a
ses for
checking wh
e
n incomp
a
tible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-rebase
.
sh: update help messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah
Newren
g
i
t-rebase
.
txt: document incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
E
l
ija
h
New
r
e
n
R
e
lN
o
tes 2
.
18: clarify wh
e
re directory rename detec
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merg
e
-recursi
v
e
:
add pointer about unduly comple
x
l
o
oking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
jah
Newr
e
n
m
erge-recursi
v
e:
rename con
f
lict_renam
e
_*() fa
m
i
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah N
e
wren
merge-recur
s
ive: cla
r
ify the ren
a
me_dir/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursiv
e
: align
l
abels
with their respe
c
tive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah New
r
en
merge-r
e
cu
r
si
v
e: fix
n
umero
u
s
argument alignment issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h
Newren
merge-recurs
i
ve: fix miscell
a
ne
o
us grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Eli
j
ah N
e
wren
RelNotes: remove duplicate release
n
o
te
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036: p
r
efer test_when_finishe
d
to manual c
l
e
a
n
u
p
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t603
6
, t
6
042: prefer test_cmp to s
e
q
u
en
c
es of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next