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
config.txt: move receive part out to a separate file
2018-08-30
Elij
a
h Newren
am:
a
v
oid directory rename detection whe
n
calling recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah
N
ewren
merge-
r
ecursi
v
e: add abi
l
i
t
y
to
t
u
rn of
f
directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
lijah
Newren
t3401
:
a
d
d another directory r
e
name testcase
f
or rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newre
n
Rem
o
v
e f
o
r
w
ard
d
eclara
t
ion of an en
u
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah New
r
en
compat/precompose_utf8
.
h: use more co
m
mo
n
incl
u
d
e
guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah N
e
wren
urlmat
c
h
.
h: fix include guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elija
h
Newr
e
n
Mo
v
e de
f
ini
t
ion of enum
b
r
anch_track from cach
e
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Ne
w
ren
al
l
oc: make
a
llocat
e
_
a
lloc_sta
t
e and
c
l
ear_
a
lloc_sta
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah New
r
en
Add m
i
ssing includ
e
s
a
nd forwar
d
de
c
l
a
rations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
ew
r
en
git-upd
a
te-index
.
txt: reword possib
l
y confusing e
x
ample
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
N
e
wren
t
7
406: avoi
d
using test_must_f
a
il for comm
a
nds other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t74
0
6
: prefer test_* helper functions to test -
[
feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t7
4
06:
avoi
d
having git commands upstream of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7
4
06: s
i
mplify by using diff --
n
ame-only instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t7
4
06: 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
t30
3
1
: update test d
e
scription
t
o
m
ent
i
o
n
desired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
lija
h
N
e
wren
read-cache:
fix
di
r
ectory/file conflict hand
l
ing in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah New
r
en
t
1015: demonstrate directory/file con
f
lict
r
ecove
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elija
h
Newren
m
e
rge-recur
s
ive
:
preserve s
k
ip_worktre
e
bit when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
t7405: verify 'me
r
g
e --
a
b
ort' works after submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah New
r
en
t7405: add a directory/sub
m
odule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
i
jah Newr
e
n
t7405: add a file/su
b
m
odule
co
n
flict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
j
ah Newren
merge
:
f
ix mi
s
leading
p
re-merge check d
o
c
u
me
n
ta
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
m
e
rge-recu
r
sive: enforce rule that index
m
atches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
t
60
4
4: add mo
r
e testcase
s
with s
t
aged c
h
a
nges before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newren
mer
g
e-recursive: f
i
x
a
s
s
umption that h
e
ad
tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recurs
i
v
e: make s
u
r
e
when we say we abo
r
t that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6044: add a
t
e
stcase f
o
r inde
x
matching he
a
d, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Ne
w
ren
t6036: add a fa
i
led confl
i
ct detectio
n
case:
regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
E
li
j
ah Newren
t60
3
6: add lo
t
s of detail for directory
/
file
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: a
d
d tes
t
case covering long chains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
w
r
en
t6042:
add t
e
stcase coverin
g
rename/rename(2to1)/de
l
ete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lij
a
h N
e
wren
t6042: add tes
t
case
c
overing rename/add/delete c
o
nflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
t603
6
: add a failed conflict
detec
t
ion c
a
se with
c
onflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h Newren
t6036: ad
d
a failed conf
l
ict de
t
ection
c
ase with
submodul
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah N
e
wren
t6
0
36: add a failed conflict det
e
ction case wi
t
h submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
ewren
t
6036: add a failed con
f
lict det
e
c
t
ion ca
s
e with
s
ym
l
ink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lija
h
Newren
t
6
036: a
d
d
a
failed confl
i
ct detection
c
as
e
w
i
t
h symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044
:
v
eri
f
y t
h
at merges expecte
d
to abort
a
ctually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah
New
r
e
n
index_h
a
s
_
changes():
a
v
o
i
d assu
m
ing operating
on the
_
index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wren
re
a
d-cache
.
c: move index_has_ch
a
nges
(
) from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Eli
j
ah Newren
t5407: fix test to c
o
v
e
r inten
d
ed argum
e
nts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply: f
i
x grammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
New
r
en
git-rebase--merge:
m
o
d
e
rnize "git
-
$
cmd" to
"
git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newre
n
Fix
u
se of strategy options wi
t
h interactive rebas
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah New
r
e
n
t
3418:
a
dd tes
t
case
showi
n
g prob
l
em
s
with rebas
e
-i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
g
i
t-rebase:
m
ake --allow-e
m
p
ty-messag
e
the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ewren
t340
1
: add directory rename testcases for rebase a
n
d am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
git-rebase
.
txt
:
document beh
a
vioral differences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
re
n
directory-rename-detec
t
ion
.
txt: tec
h
nical docs on abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
git-rebase
.
txt: address confusion betw
e
en --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Ne
w
ren
gi
t
-rebase: error out when in
c
o
mpatible options passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newr
e
n
t
3
42
2
:
new testcases for
c
hecking w
h
en incompat
i
ble
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elij
a
h N
e
w
r
en
git-r
e
base
.
sh: update
h
elp messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah New
r
e
n
git-rebase
.
t
xt: documen
t
inco
m
patible option
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Eli
j
ah Newren
RelNotes 2
.
18: clarify w
h
er
e
d
i
rectory rename
detect
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
i
j
ah Newren
merge-recursive: add pointer
a
bout u
n
duly complex l
o
o
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-recursive: rename conflict_rename_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah Ne
w
ren
m
erge-re
c
ursive
:
cl
a
rify th
e
rename
_
dir/REN
A
M
E_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newren
merge-recursive: al
i
gn l
a
bels with th
e
ir respecti
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
mer
g
e
-recursive: fix nume
r
ou
s
ar
g
ument alignm
e
nt issu
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
m
erge-recursive: fix miscellaneous grammar error in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
E
lijah Newren
RelNo
t
es:
r
emove duplicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah
N
e
wren
t6
0
36: prefer test_when_finished
t
o manual
c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
El
i
jah N
e
w
r
en
t60
3
6,
t
6042: prefer
test_cmp to sequ
e
nces o
f
te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042:
p
refer test_path_i
s
_file
,
test_pa
t
h_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah New
r
en
t
6
036, t6042: use test_lin
e
_
c
ount instead
of wc
-l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t60
3
6, t
6
042: use test_create
_
repo to
k
e
ep tests independ
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
E
l
i
j
ah N
e
wren
rev-par
s
e: check looku
p
'ed commit references for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Ne
w
ren
me
r
ge-recursive: provide pair of `unpack_trees_{start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix che
c
k for skipability of wo
r
king
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recur
s
ive: make "Auto-merging" c
o
mm
e
n
t
show
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
m
e
rge-recursiv
e
:
f
ix remainde
r
of was_dirty() to use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive: f
i
x was_tracked() to quit lying wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Ne
w
ren
t
6
046:
t
e
stc
a
s
e
s ch
e
cking whether
u
pdates can
be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
merge-recursi
v
e: av
o
id
triggering add_cachei
n
f
o
error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
r
ge-recursive: move mo
r
e is_d
i
rty
h
and
l
i
ng to me
r
ge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
me
r
ge-recursi
v
e: improve add_cach
e
info error
handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursive:
a
void s
p
urious rename
/
rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
directory rename d
e
t
e
c
tion: new testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursiv
e
: fix remaini
n
g di
r
ectory rename +
dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge-recu
r
siv
e
: fix over
w
riting dirt
y
fi
l
es invol
v
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merg
e
-recursive
:
a
void cl
o
b
b
er
i
ng untracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
w
r
e
n
merge-recursive: apply necess
a
ry
modifications
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
New
r
en
merge-recursi
v
e:
whe
n
compa
r
i
ng files, don't in
c
lude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-recursive:
check for file level conflicts th
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merg
e
-recurs
i
v
e
: a
d
d co
m
putation of collision
s
due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ew
r
en
merge-
r
ecur
s
ive:
check
f
or di
r
ectory lev
e
l conflict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursive: add get
_
dire
c
tory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elija
h
Newren
unpack_tre
e
s
:
f
ix breakage whe
n
o->src_index !
=
o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
El
i
jah Newren
Make runni
n
g git under o
t
h
e
r debugger-like programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
merge-
r
ecur
s
ive: make a he
l
per function fo
r
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
r
ge
-
recursiv
e
: split out
c
ode for determini
n
g diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursi
v
e: make !o->d
e
tec
t
_ren
a
me c
o
depath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
rge-recursive: fix le
a
ks of a
l
located renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah
Ne
w
ren
me
r
g
e-rec
u
rsive: intr
o
duc
e
new func
t
ions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
a
h Newren
merge-
r
ecursive: move the get_renam
e
s() functio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
rectory rename detection:
t
e
s
ts for handling overwritin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
d
irectory rename detection: tests for h
a
nd
l
ing ove
r
writing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direct
o
ry rename detection: miscell
a
neous te
s
t
c
ases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next