repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-show-ref.txt: fix order of flags
2019-01-10
Elijah
Newren
g
i
t-
s
how-r
e
f
.
t
x
t: fix order of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
E
l
ijah Newren
com
m
it: fix erron
e
ous BU
G
, 'mu
l
tiple renames on the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
sequencer: f
i
x --allow-empty-me
s
sage
b
ehav
i
o
r
, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah Newren
updat
e
-ref: allow --no-deref wit
h
--stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Eli
j
a
h
Newren
update-ref: fix t
y
pe o
f
upd
a
te_fl
a
g
s
v
ariable to mat
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah
N
ewren
rerere: avoid b
u
ffer
o
v
errun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
li
j
a
h
Ne
w
ren
t4200: demonstrate rerere se
g
fault on sp
e
cially
cr
a
fted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Elijah Newren
R
e
move superfluou
s
t
r
aili
n
g
s
emi
c
olon
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
am: avoid directory rename detection when calling re
c
ursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Newren
merge-recur
s
ive: add ability to turn
o
ff directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elija
h
Newr
e
n
t3401: a
d
d another
d
i
r
ect
o
ry
r
ename
t
estcase for rebas
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Remove for
w
ard
d
e
c
laratio
n
of an enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
ren
compat/precompose_utf8
.
h
:
u
s
e
m
ore commo
n
include guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
re
n
urlm
a
tc
h
.
h: fi
x
inclu
d
e guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah New
r
en
Move definiti
o
n o
f
enum bra
n
ch_t
r
a
c
k
from cac
h
e
.
h
to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
N
ewren
alloc:
make allo
c
ate_a
l
loc_state and clear_alloc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ijah Newren
Add miss
i
ng includes and forward declarations
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
i
jah Newren
git-upd
a
te
-
index
.
t
xt: reword
p
oss
i
bly confusi
n
g ex
a
mple
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah Newren
t740
6
: avoid using test_must_fail for commands o
t
h
e
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7
40
6
:
prefer test_* hel
p
er fun
c
t
io
n
s
to test -
[
feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ija
h
New
r
en
t740
6
:
avoid ha
v
ing git commands upstre
a
m of a pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
l
ijah N
e
wren
t7406: simpl
i
fy by using diff
--name
-
only instead o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah
Newren
t7406: fi
x
call t
h
at was failing
for the wrong reason
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Elijah Newren
t
3
03
1
: u
p
date
test descr
i
ption to me
n
t
ion
d
e
sired behavior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
r
ead-ca
c
he
:
f
i
x d
i
rec
t
ory/file co
n
flict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
E
lijah Ne
w
ren
t10
1
5: d
e
monstrate direc
t
ory/file confli
c
t re
c
o
very
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah N
e
wren
merge-recursi
v
e: preserve skip_wo
r
ktree bit when
necess
a
r
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah Newren
t
7
405: verify 'merg
e
--abort'
w
or
k
s af
t
er submod
u
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405: add
a
directory
/
sub
m
odule
c
onflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t7405:
a
dd a file
/
submodule confl
i
ct
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
me
r
ge: fix
m
isl
e
ading
pre-me
r
ge check documenta
t
ion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
Newren
merge-recursive: enforce rule that index matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Ne
w
ren
t6044:
a
d
d mo
r
e
t
e
stcases with staged c
h
anges before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah Newren
merge-recur
s
ive: fix
a
ssu
m
p
t
ion
th
a
t
h
ead tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
re
n
merge
-
r
e
c
u
r
sive: make s
u
re
when w
e
say we abor
t
that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
t6
0
44: add a
t
estcase for index
m
a
tching head, when
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Ne
w
re
n
t603
6
:
add a failed
co
n
flict
d
et
e
ctio
n
case:
r
egula
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah Newren
t6036
:
add lots of d
e
tail for directory/file conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
jah N
e
wren
t6042: add testcase covering
long ch
a
ins of ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: add testcase covering
rename/rename(2to1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
604
2
: add testcase co
v
e
ring
renam
e
/add/delete confli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6036: a
d
d a f
a
iled conflict
detectio
n
ca
s
e with confli
c
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah New
r
en
t
6036: add a fail
e
d
c
on
f
lict detec
t
ion case
w
ith
su
b
module
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6036: add a failed conflict det
e
ction case with submodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elija
h
Newren
t6036: add a failed conflict
detection
c
ase
with symli
n
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
j
ah Newr
e
n
t
6
036: add
a
failed conflict det
e
ction cas
e
w
i
th sy
m
link
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newr
e
n
t6044:
verify that merg
e
s expected to abort
a
ctually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
index
_
has_
c
han
g
es():
a
vo
i
d
a
s
s
uming
operat
i
n
g
o
n
the_ind
e
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Ne
w
ren
r
ead-cache
.
c: move ind
e
x
_
has_change
s
() from merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
lijah Newren
t5
4
07: fix tes
t
to
cov
e
r intended arguments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
apply: fi
x
gr
a
mmar error in
c
omment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newr
e
n
gi
t
-rebase--merge: modern
i
ze "
g
it-
$
cmd" 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
o
ptions with in
t
era
c
tive
re
b
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
t3418
:
add
t
estcase showing
p
roblems wit
h
rebase
-
i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newren
git-rebase: make -
-
allow-empty-message the de
f
ault
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t3401:
add
d
irectory r
e
name testcases
for rebase an
d
am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
a
h Newren
g
i
t-reb
a
se
.
t
xt: document behavioral
dif
f
erences betwee
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wren
di
r
ect
o
ry-rename-dete
c
t
i
on
.
t
x
t:
t
echnical docs o
n
abilities
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah
Newren
git-
r
ebase
.
t
xt: address co
n
fusion between --
n
o-ff
vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
N
ew
r
en
git-rebase: error out when
incomp
a
t
i
b
l
e o
p
t
i
o
n
s passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newre
n
t3422: new
t
e
stcases fo
r
checking
w
hen incompat
i
ble
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git-reb
a
se
.
sh:
u
pdate
h
elp messages
a
bi
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
l
i
j
a
h
Newren
git-rebase
.
txt: docum
e
nt
i
ncompa
t
ible opt
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Ne
w
ren
R
elN
o
tes 2
.
18: clarify where dire
c
tory
ren
a
me d
e
tection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
El
i
jah New
r
en
merge-recursiv
e
: add
p
oint
e
r
a
b
o
ut unduly compl
e
x l
o
oking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elijah Newren
merge-
r
ecursive: re
n
am
e
conflict_rename_*() family
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
l
ijah Newre
n
merge-
r
ecur
s
ive: clarify the r
e
name_dir/RENAME_DIR
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elija
h
Newre
n
merge-recursive: align
labels with the
i
r
r
es
p
e
ctive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
Elija
h
Newren
merge-recursive: fix numer
o
us argu
m
ent align
m
e
n
t issue
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-12
E
lijah Newre
n
merge-r
e
cursive:
fix m
i
scellaneous gr
a
m
mar error
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
Re
l
Notes: r
e
mo
v
e
d
upl
i
cate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
lijah Newren
t6036:
pre
f
er
t
est_when_f
i
n
i
shed to manual c
l
e
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
r
en
t6036, t
6
042: prefer t
e
st_cmp
t
o sequences of test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newr
e
n
t6036, t6042: prefer test_path_is_fi
l
e
, te
s
t_path_i
s
_missi
n
g
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036, t6042: use test
_
l
i
n
e_count in
s
tead of
wc
-l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
Newr
e
n
t
6036,
t60
4
2: use test
_
create_repo
to keep tests independe
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
E
lijah
Newren
rev-parse: check l
o
okup'ed
commit re
f
erences
for NU
L
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newren
mer
g
e-recursive: pr
o
vide pair of `un
p
a
c
k_tree
s
_
{
start
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah
Newren
m
e
rge-recu
r
sive: fix
check for skipability of w
o
rking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
a
h
N
ewren
m
erge-recu
r
sive: make "Auto-mergin
g
"
c
om
m
ent
s
ho
w
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge
-
recur
s
i
ve: fi
x
rema
i
nder
o
f was
_
dirty()
t
o use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recu
r
s
i
ve:
f
ix was_trac
k
e
d
()
to quit
lying with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
Newren
t6046:
t
estcases ch
e
cking
w
hether upda
t
e
s
can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h
Newr
e
n
merg
e
-recurs
i
ve: avoid triggeri
n
g
add_cache
i
nfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah New
r
en
me
r
ge-recur
s
ive: move more is_dirty ha
n
dli
n
g to merge_con
t
en
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursiv
e
: impr
o
ve add_cacheinfo error handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
Newren
mer
g
e-recursive: avoid sp
u
rious rena
m
e/re
n
ame conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
directory rename detectio
n
: new tes
t
c
ases s
h
owcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursiv
e
: fix remaining direc
t
ory rename + dirt
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-re
c
ursive: fix o
v
erwriting dir
t
y files involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive: avoid c
l
obbering
untracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge-recursive:
a
pply necess
a
ry mod
i
fications
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elij
a
h Newren
me
r
ge-recursive
:
when co
m
paring fil
e
s
,
don't i
n
c
l
u
de
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
i
jah Newr
e
n
merg
e
-recursive: c
h
eck for
f
ile level c
o
nflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recu
r
sive: add computa
t
ion of
collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h
N
ewren
merge-recursive: chec
k
for directory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newr
e
n
merge-r
e
c
u
rsive: ad
d
get_direct
o
ry_
r
enames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
un
p
ack_trees:
f
ix b
r
eakage when
o
->s
r
c_index != o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newren
Make
r
unning g
i
t
u
nder other debugger-
l
ik
e
pro
g
rams
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
e
n
merge-recursive: make a helper func
t
i
o
n
f
or cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next