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
Add missing includes and forward declarations
2018-08-15
Elijah New
r
en
Add missing includes and for
w
ard declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
7
40
5
: ver
i
fy 'merge -
-
abort' works
a
fter subm
o
du
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7
4
05: a
d
d a d
i
rectory/submodule
c
onfl
i
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah
N
e
w
ren
t
7
4
05: add a
f
ile/submodu
l
e confli
c
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
merge: fix mislead
i
ng pre-m
e
rge check documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recursiv
e
: enf
o
rce rule that index m
a
tch
e
s head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah New
r
en
t6044: add more testc
a
ses with staged chang
e
s b
e
fore
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ija
h
Newren
me
r
ge-recursive: fix
assumptio
n
that head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
merge-recur
s
i
v
e:
make s
u
re when w
e
s
ay w
e
abort th
a
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah New
r
en
t6044: add
a
te
s
tcase for index matching hea
d
, whe
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6036:
add a f
a
iled conflict detection
c
a
se: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newr
e
n
t
6036: add
l
ots of d
e
t
ail
f
or dir
e
ctory/f
i
l
e
confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Ne
w
ren
t
6
042: add testcase co
v
ering long chains of rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Newren
t6042: add testcase cover
i
ng rename/ren
a
me(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
jah Newren
t6
0
42: add testca
s
e cov
e
r
ing rename/a
d
d/delete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newr
e
n
t
6
036:
a
dd a failed conflict detection case
w
i
th conflic
t
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah
Newren
t
6
036: ad
d
a failed conflict detec
t
ion case w
i
th submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wren
t
6
036
:
a
d
d a failed conflic
t
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
f
a
il
e
d conflict detection case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
j
a
h Newren
t
6
036: add a failed
c
onflict detecti
o
n case wit
h
symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
N
e
wren
t6044: verify that
m
erges expected to a
b
ort a
c
t
ually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
index_ha
s
_changes():
a
void assuming operating on the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elij
a
h New
r
en
read-
c
ache
.
c:
m
ov
e
i
ndex_has_cha
n
ges() from me
r
ge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t5407
:
fix test to cover intended argume
n
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
lijah Newren
apply:
fix g
r
amm
a
r e
r
r
or in commen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah Newren
git-rebase--
m
e
rge: modern
i
ze "git-$c
m
d
"
to
"
git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
Fix
u
s
e
of strategy options
w
ith interactive
rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ija
h
Newren
t3418: add testcase showing problems wi
t
h
r
ebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ij
a
h
Newren
gi
t
-
r
ebase: make --all
o
w-empty-messag
e
the
d
efault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
w
ren
t
3
401:
a
dd directo
r
y ren
a
me te
s
tc
a
se
s
for rebase and am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
git-rebase
.
t
xt: document behavi
o
r
al differences between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
N
ewr
e
n
directory-rena
m
e-
d
etection
.
txt:
tec
h
nical
d
ocs o
n
abil
i
ti
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
Newren
git-r
e
base
.
txt: address confusion betwe
e
n --no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-rebase: error
out when
i
ncompa
t
ible options passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3422:
new testca
s
es for ch
e
cking
w
hen incompat
i
ble
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newre
n
git-rebase
.
sh: updat
e
h
e
lp
m
e
s
sages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah
Newren
git-rebase
.
txt: document incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
RelNotes 2
.
18: clari
f
y whe
r
e
dir
e
ctory rename detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
m
er
g
e-recursiv
e
: add poi
n
ter a
b
out
u
ndul
y
comple
x
looking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Eli
j
ah
New
r
en
merge-
r
ecu
r
sive:
r
en
a
me con
f
lict_rename_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah N
e
w
ren
m
erge-recursive: clarify
the rename_dir/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newren
mer
g
e-recursive: alig
n
labels with thei
r
respective
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elij
a
h Newren
merge-recursive: fix nume
r
ous ar
g
ument
a
lignment
i
ss
u
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah
Newr
e
n
mer
g
e-recur
s
i
v
e: f
i
x
misc
e
lla
n
eo
u
s
grammar error
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elij
a
h Newren
RelNotes: r
e
move
d
u
p
lic
a
te
r
elease note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah Newren
t6036:
p
r
efer te
s
t
_
when_
f
inished to manual c
l
eanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t
603
6
, t604
2
: prefer test_cm
p
to se
q
uences of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah Newren
t6036, t6
0
42: p
r
efer
t
est
_
p
a
th_is_file, test_path_is_missing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
Newren
t6036,
t6042: use test_line_coun
t
i
n
ste
a
d of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah N
e
wren
t6036, t6042:
us
e
te
s
t
_
create_rep
o
to keep test
s
indepen
d
en
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newre
n
rev-parse: check l
o
okup'
e
d
c
ommit r
e
fer
e
nces
for NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newr
e
n
merge-
r
ecurs
i
ve: provide pair of `unpac
k
_tre
e
s_{s
t
art
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix check for
sk
i
pability of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewr
e
n
merge-rec
u
rsive:
m
ake "Au
t
o-mergi
n
g
"
comment show fo
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
m
e
rge-recu
r
s
iv
e
:
f
ix remain
d
er of was_dirty() to u
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recu
r
s
i
v
e: fi
x
was_tracked()
to quit lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
ewren
t
6
046: testcases che
c
k
i
n
g w
h
ether updates can be skippe
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recu
r
s
ive: avoid triggering
add
_
cacheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wren
merge-re
c
ursive
:
move more is_dirty handl
i
ng t
o
merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
m
erge-recursive: improve add_cach
e
i
n
fo error handli
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah Newren
m
erg
e
-recursive: avo
i
d
spurious r
e
nam
e
/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
directory rename detectio
n
:
new testcases s
h
owcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recursive: fix
remaining directory rename
+ dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-
r
ec
u
r
s
iv
e
: f
i
x overwriting dirty files
involve
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recur
s
ive: avoid clobberi
n
g unt
r
acked f
i
les with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
mer
g
e-recursive: apply neces
s
ary mo
d
ifications for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Ne
w
r
e
n
merge-recursive:
w
hen c
o
mparing
fil
e
s, don'
t
i
n
c
lude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newren
merg
e
-recursive:
c
hec
k
for file level conflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h N
e
wren
merge-recur
s
ive: add co
m
puta
t
ion of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: c
h
ec
k
f
o
r dire
c
tory level co
n
flicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
m
erge-
r
ecursive: add
get_direc
t
o
r
y
_re
n
a
m
es()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
u
n
pack
_
trees:
f
ix bre
a
kage
w
h
en o->src_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
E
l
ijah Newre
n
M
a
ke ru
n
n
i
ng git under other debugger-l
i
ke programs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-r
e
c
ur
s
iv
e
:
make a helper function for
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
merge-recursive: split out code
fo
r
determinin
g
diff_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
ja
h
N
ewr
e
n
merge-recursive: make !o
-
>detect_rena
m
e codepath
more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-r
e
cursive: fix leaks of alloca
t
ed rena
m
es and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
me
r
ge-recursive: introduce
n
ew functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
rg
e
-r
e
cu
r
sive: m
o
ve the get_renames() fu
n
ctio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
directory rename
de
t
ection: tests fo
r
handling o
v
erwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
dir
e
ctory r
e
name de
t
e
ction: tests for
handling o
v
erwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dire
c
t
ory rename detection: mis
c
ellaneous tes
t
cas
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection:
t
e
stcases exp
l
oring pos
s
ibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory ren
a
me detecti
o
n:
mo
r
e involv
e
d edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
directo
r
y
rena
m
e detection:
tes
t
cases c
h
ec
k
i
ng w
h
ich
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h
N
e
wr
e
n
d
i
rectory
r
ename
d
e
t
ec
t
ion: files/di
r
ectories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory ren
a
me detection: partia
l
ly renamed director
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Ne
w
r
e
n
direct
o
ry re
n
a
me detectio
n
:
t
e
stcas
e
s to a
v
oid
t
aking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
d
irectory
rename
det
e
ction:
directory split
t
ing testca
s
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
New
r
en
directory r
e
name detection: ba
s
i
c testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
El
i
jah N
e
wren
Documentation: normal
i
ze spelling of 'no
r
malised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah
N
ewr
e
n
Document
a
t
ion: fix s
e
veral
one-chara
c
t
er-off spell
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive: ensure we w
r
ite upd
a
t
e
s for directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
merge-
r
ec
u
rsive:
av
o
id spuri
o
us rename/re
n
ame
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
directory rename detectio
n
: new test
c
ases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recu
r
sive: fix
remaining dir
e
ctory rename + di
r
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newre
n
m
e
rge-recursive: fix ov
e
rwriting dirty files inv
o
lved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive:
a
void c
l
obb
e
ring untracked fi
l
e
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ij
a
h
N
ewren
merge-
r
ecursive: apply nec
e
ssary mo
d
ific
a
t
i
ons for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: when compa
r
ing
f
il
e
s, don't inclu
d
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next