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 'ot/ref-filter-object-info'
2018-12-09
Elijah Newren
git-r
e
base
.
txt: u
p
date note about dire
c
t
ory
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export:
a
dd a --sh
o
w-orig
i
nal-id
s
option t
o
show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lij
a
h Newren
fast-import: remove
u
nmaintained duplicate doc
u
m
entation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fas
t
-ex
p
ort: ad
d
--r
e
ference-excluded-parents
o
ption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah
N
e
w
ren
fast-export: en
s
ure we export requ
e
sted ref
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
Ne
w
ren
fa
s
t-export: when using paths, avoi
d
corrupt stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
e
wre
n
fa
s
t-export: mo
v
e commit r
e
writing logi
c
i
nto a funct
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-expo
r
t
:
avoid dying when filtering by pa
t
hs and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
ewren
fast-ex
p
ort
:
us
e
val
u
e f
r
om
c
o
r
rect
enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
N
ewren
gi
t
-fast-export
.
txt: clar
i
fy misleading documentation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newren
git-fast-import
.
txt: fix
docu
m
e
n
ta
t
ion fo
r
--quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah New
r
en
fast-expor
t
: conve
r
t sha1 to oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
j
ah Newren
t6036,
t
6043: increase code coverag
e
fo
r
file col
l
i
s
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah N
e
wren
merge-re
c
u
r
sive: improve
r
ename/ren
a
me(1to
2
)/add[/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recur
s
ive: use handle_file_collision for
a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merg
e
-recurs
i
ve
:
i
m
prove handling
f
o
r
rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merg
e
-
r
ecursive: f
i
x rename/add conf
l
ic
t
handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
me
r
g
e
-recursive: new fun
c
tion fo
r
bett
e
r
c
olliding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
i
j
ah Newren
merge
-
recurs
i
v
e: increase marker
l
ength with depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
ewren
t
6
03
6
, t6042: testcases
fo
r
rename collision of already
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newre
n
t6042: add
tests fo
r
c
o
nsis
t
e
n
c
y in file colli
s
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elij
a
h
N
e
wren
f
sck: move fsck_he
a
d_l
i
nk() t
o
get_d
e
f
a
ult_he
a
ds()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elij
a
h Newren
merge-recur
s
i
v
e: avoid s
h
o
w
ing conflicts with
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newr
e
n
merge-recursi
v
e:
improve auto
-
merging messages
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah
N
e
wren
commi
t
: fix er
r
oneous BUG, 'multip
l
e renames
on t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
j
a
h Newren
merg
e
-rec
u
rsive: rename merge_fil
e
_1() and mer
g
e_conten
t
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recursive:
r
emove final rem
a
inin
g
caller o
f
merge_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Eli
j
ah
N
ewren
merge-recursi
v
e: avoi
d
wr
a
pp
e
r function when unnecess
a
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
merge-recu
r
sive: set pa
t
h
s
correctly wh
e
n three-way
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
E
l
i
jah Newren
sequ
e
ncer: fix
-
-allow-empty-mes
s
age b
e
havior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah N
e
wr
e
n
u
pda
t
e
-
ref: allow -
-
no-de
r
ef with --st
d
i
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
update-ref: fix type o
f
update_flags
v
ariable
t
o match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Eli
j
ah Newren
rerere:
a
void buffer over
r
un
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
t420
0
: demonstr
a
te r
e
r
e
re s
e
gfault on specially cra
f
ted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
El
i
jah Newr
e
n
Remove sup
e
r
f
luous traili
n
g
se
m
icolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Ne
w
ren
am: avoid direc
t
ory
r
e
n
ame
d
etect
i
on when
calling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ijah Newr
e
n
m
e
rge-recur
s
ive
:
add ability to
t
urn off
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
t3
4
01
:
a
d
d
a
n
other
directory rename testcas
e
fo
r
rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah N
e
wr
e
n
Remo
v
e forward declaration
o
f an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
c
o
mpat/prec
o
mpo
s
e_ut
f
8
.
h
: use more common
i
n
clude
g
u
a
rd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
urlmatch
.
h
:
fix include g
u
ard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
r
en
Move definitio
n
of enum b
r
anch_track from
c
ache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
alloc:
make allocate_alloc_state and clear_allo
c
_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Add missing in
c
l
u
des and fo
r
ward dec
l
arations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
g
it-u
p
date-ind
e
x
.
tx
t
:
rew
o
rd
possibly con
f
using e
x
ample
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah Newren
t740
6
:
avoid u
s
ing te
s
t_mus
t
_f
a
i
l for commands other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7
4
06: prefer test_* helper functio
n
s to test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah N
e
wren
t7406: avoid hav
i
ng git comman
d
s upstream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
El
i
jah
N
ewren
t7406: simp
l
ify by us
i
n
g diff
-
-name-only i
n
stead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: fix c
a
ll
that was
fai
l
ing
f
or the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elija
h
Newren
t3031
:
u
p
date t
e
s
t
des
c
ri
p
tion
t
o mention des
i
red behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elija
h
New
r
en
r
e
ad-cach
e
:
fix dire
c
tory/file c
o
nflict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
l
ijah
N
ew
r
e
n
t
1
015: demonstrate directory/file con
f
lict recovery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elij
a
h Newr
e
n
merge-re
c
u
rsive: preserve s
k
ip_worktree bit
w
h
en ne
c
essary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newr
e
n
t7405:
verify
'
merg
e
-
-
abo
r
t' wo
r
ks
after
s
u
bmodul
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
w
ren
t7405
:
add a directory/submodu
l
e
conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newre
n
t7405
:
a
d
d a file
/
s
ubmodu
l
e conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
m
e
rge: fix
m
islea
d
in
g
p
r
e-merge ch
e
ck doc
u
mentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newr
e
n
merge-recursive: e
n
forc
e
r
ule that
index matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
t6044: add
m
ore t
e
s
tcases
w
it
h
staged changes
before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
merge-rec
u
rs
i
v
e
:
fix assumption that head tree be
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah N
e
wren
merge-re
c
urs
i
ve: make
s
ur
e
when we
say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: a
d
d a t
e
stc
a
s
e for inde
x
ma
t
c
hi
n
g h
e
a
d
, w
h
en
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
t6036: ad
d
a fai
l
ed conflict dete
c
ti
o
n case: reg
u
lar
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
E
li
j
ah Newren
t603
6
: a
d
d lots of
d
etail fo
r
d
i
rectory/f
i
le con
f
licts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lij
a
h Newren
t604
2
: add testc
a
se c
o
vering l
o
n
g chains o
f
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: add testcas
e
c
overin
g
rename/rename(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
N
e
wren
t604
2
: add
testcase coveri
n
g rename/add/delete confl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t6
0
36: add a
failed c
o
nflict detection c
a
se with conflict
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
036:
a
dd
a failed conflict detect
i
o
n
case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: add a fail
e
d confl
i
ct
d
etection case wi
t
h su
b
module
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t6036: add a
f
ailed conflict detect
i
on case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah
N
e
w
ren
t6036: add a failed conflict detection case
w
it
h
s
ym
l
ink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t604
4
: verify t
h
at merge
s
expecte
d
to abort
actua
l
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
index_has_
c
hanges(): avoi
d
a
ssumi
n
g ope
r
atin
g
on
t
he_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
read
-
cache
.
c: mo
v
e index_has
_
c
h
a
nges() from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
El
i
jah Newren
t5407: fix test to cover intended arg
u
me
n
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah New
r
en
apply: fix grammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newr
e
n
gi
t
-re
b
ase--merge: m
o
dern
i
ze "gi
t
-$cmd"
to "git $c
m
d"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
Fix use of strategy
o
p
tions wit
h
inte
r
active
r
ebas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t34
1
8: add t
e
stcase showing pro
b
l
ems wit
h
rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah New
r
en
git-rebase: make -
-
a
llow-emp
t
y
-
message the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
N
e
w
ren
t3401:
a
dd directo
r
y ren
a
me testca
s
es for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newren
g
it-re
b
ase
.
txt: document behavioral differences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
directory
-
re
n
ame
-
detection
.
txt:
t
e
c
hni
c
al
docs on abilitie
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
en
git-reb
a
se
.
txt: add
r
ess conf
u
sion between --no-ff
vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
git-r
e
base: er
r
or out whe
n
in
c
ompat
i
ble option
s
passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newr
e
n
t3422
:
new
t
estcases for checking when in
c
ompatib
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-rebase
.
s
h
: update he
l
p messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elij
a
h Newren
git-reb
a
se
.
t
xt: document incomp
a
tible o
p
tions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
RelNotes 2
.
18: c
l
arify where directory rename de
t
ection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lij
a
h New
r
en
merge-recurs
i
ve: add
poin
t
e
r
ab
o
ut unduly c
o
mplex loo
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Ne
w
ren
merge-recursive
:
rename conflict_re
n
ame_*() fa
m
ily
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
mer
g
e
-re
c
ursi
v
e: clarify the rename_dir/RENA
M
E
_
DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h Ne
w
ren
mer
g
e-recurs
i
ve:
al
i
gn lab
e
l
s
w
it
h
their
re
s
pe
c
tive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newr
e
n
merge-re
c
ursive:
f
i
x
n
umerous argum
e
nt alignmen
t
issues
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
m
e
r
g
e-recu
r
sive: fi
x
miscellaneous grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
RelNotes:
rem
o
ve duplic
a
te rel
e
ase
n
ote
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewren
t603
6
: pre
f
er
t
est_when_finished to manu
a
l cle
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elija
h
Newren
t6036, t6042: prefer test_cmp to sequences
o
f test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next