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
url: do not allow %00 to represent NUL in URLs
2019-02-14
Elijah Newren
gi
t
-
r
ebase
.
txt: update to re
f
lect merge now implemented
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah
Ne
w
re
n
git-sh
o
w-re
f
.
txt: fix orde
r
of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elija
h
Ne
w
ren
rebase: implemen
t
--me
r
ge via the interactive
m
ac
h
inery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah Newren
reba
s
e: define
l
inearization
ordering a
n
d enf
o
rc
e
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lij
a
h Ne
w
ren
git-l
e
gac
y
-rebase: simplify unnec
e
ssary
t
riply-n
e
sted
i
f
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
i
jah Newren
git-rebase, sequen
c
e
r
: extend --quie
t
opt
i
on
for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h
Newren
am, rebase--merge
:
do not over
l
oo
k
--skip'ed comm
i
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elij
a
h
N
e
wren
t5407
:
add a
t
e
s
t demonst
r
at
i
ng how in
t
eract
i
v
e h
a
ndles
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Ne
w
ren
reba
s
e: fix in
c
o
mpati
b
le op
t
ions erro
r
message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
reb
a
s
e
:
make buil
t
in a
n
d legacy scr
i
pt error me
s
sages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elij
a
h Newren
gi
t
-r
e
base
.
tx
t
: up
d
a
te not
e
about
direc
t
o
ry renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
jah Newren
fast-e
x
port: a
d
d
a
--
s
how-ori
g
inal-ids
o
p
tion to
s
how
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah N
e
wren
fast
-
import
:
remove
u
nmain
t
ained duplicat
e
documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newre
n
fast-ex
p
ort: add --reference-excluded-p
a
re
n
ts option
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
a
h
Newren
fast-expor
t
: ensure we export requeste
d
refs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah N
e
wren
fast-export: when us
i
ng pat
h
s
, avoid co
r
rupt stre
a
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
fast-
e
xpor
t
: move commit rewr
i
ting
log
i
c into
a
f
u
nction
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
i
j
ah
N
ewren
fast-export: avoid d
y
in
g
when filteri
n
g
by paths
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: use v
a
lue from co
r
rect enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
lijah Newren
g
i
t-fast-ex
p
ort
.
txt: clarif
y
mis
l
eading documentation
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
g
i
t-fast-im
p
o
r
t
.
txt: fix documen
t
a
tion f
o
r --quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast-export: convert sha1 to oid
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
El
i
jah Newren
t
6
0
3
6, t604
3
: increase c
o
d
e coverage for
f
ile co
l
lis
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newr
e
n
merge-recursive: improve ren
a
me/rename
(
1to2)/add
[
/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
i
jah
Newren
merge-recursive: u
s
e
handle_file_coll
i
sion for add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah
N
e
wren
merge-recursive: impro
v
e handling f
o
r
rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah Newren
merge-recursive:
fix
r
ename/add c
o
n
flict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
m
erg
e
-recursive
:
new fu
n
ction fo
r
better collidin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah Ne
w
ren
mer
g
e-recursiv
e
: incre
a
s
e m
a
r
ker len
g
t
h
wit
h
depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elij
a
h Newren
t6036, t6042: tes
t
cases for ren
a
me co
l
li
s
ion of alr
e
ady
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
w
r
en
t6042: add
tests for
c
onsistency in file collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Eli
j
a
h
Newren
fs
c
k:
m
o
ve
fsck
_
h
e
ad_l
i
nk
(
) to get_
d
e
f
ault_head
s
()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
E
l
ijah Newren
merge
-
recursive: av
o
id showing conflicts with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
E
l
i
j
ah N
e
wren
merg
e
-
r
ecursive: improve au
t
o-merging messages
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
c
ommit
:
fix erroneous BUG
,
'multi
p
le r
e
names o
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah
Newren
m
erge-recursive: rename
me
r
ge
_
file_1() and merge
_
content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
m
e
rg
e
-re
c
ursive: remove final re
m
aining caller of m
e
rg
e
_file
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elij
a
h Newren
merge-recursive: avoid
w
rapper functi
o
n wh
e
n
u
n
necessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
El
i
jah Newren
merge-recursive:
se
t
pa
t
hs correctly
w
hen
t
hree-
w
a
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elij
a
h Newr
e
n
seque
n
cer: f
i
x --a
l
low
-
empty-message beh
a
v
ior, make
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
Newren
updat
e
-ref: all
o
w --no-deref wit
h
--
s
t
d
i
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
Elijah
N
ewren
update-ref:
fix typ
e
o
f update_flags variable to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
rere
r
e: avoid buf
f
er overrun
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
E
lijah Newren
t
4
2
0
0
: demo
n
s
t
rat
e
rer
e
re seg
f
a
u
lt on specially crafted
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
Eli
j
ah N
e
wren
Remove superfluous trailing semicolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Eli
j
ah Newr
e
n
am: avoid
directo
r
y ren
a
me detec
t
i
on when call
i
n
g
recu
r
s
ive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Ne
w
ren
me
r
ge-recursive: add abilit
y
to turn
off dire
c
to
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elij
a
h Newre
n
t
3
401: add another direct
o
ry rena
m
e testcase f
o
r rebase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Remove for
w
ard d
e
claration of an en
u
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah
Newren
compat/precom
p
ose_utf8
.
h: use more common include gua
r
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
l
ija
h
Newren
u
r
l
match
.
h:
fix inc
l
ude guard
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
E
lijah
Newr
e
n
Mo
v
e definition of enum branch_
t
rac
k
from cache
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
alloc: make a
l
locate_allo
c
_
state
and cle
a
r_allo
c
_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elij
a
h Newren
Add missing incl
u
des
a
nd forward declarat
i
ons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
git-update-ind
e
x
.
txt: reword
p
ossib
l
y confusing example
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7
406:
avoi
d
usin
g
test_mus
t
_fail for
commands othe
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
t7406: prefer test_*
h
elp
e
r
functi
o
n
s
to
test -[feds]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t
7
406:
a
v
oid having
g
i
t
commands upstream of a
pipe
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah New
r
en
t7406:
s
impli
f
y by
using diff --name-only instead of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newre
n
t7
4
06: fi
x
call that was failing for the
w
rong re
a
son
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
Eli
j
ah Newr
e
n
t30
3
1: update test description to mention desire
d
b
e
havior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Eli
j
ah Newr
e
n
read-c
a
che: fix directory/file conflict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
t1015: d
e
monstrate
d
irectory/file conflict r
e
covery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah Newren
m
erge-recu
r
sive: preserve skip_work
t
ree bit when necessar
y
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elij
a
h Newre
n
t7405: verify 'm
e
r
g
e --abort' works after su
b
m
od
u
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Ne
w
r
en
t7405: add
a directory/submodule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t
7
4
0
5: ad
d
a f
i
l
e
/
s
u
b
module
c
onflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
me
r
g
e
: fi
x
mislea
d
ing p
r
e-merge c
h
eck docu
m
e
ntation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
m
erge-recursive:
enforce rule that index matches head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
t6044: add more testcases with
staged change
s
before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
merge-recursive: fix ass
u
mption t
h
at head tree b
e
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah Newren
me
r
ge-recursive:
m
ak
e
sure when we say we abort tha
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
t6044: add a testcas
e
for index matching
he
a
d,
w
hen
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
a
h
Newren
t6036: add a failed c
o
n
f
l
i
ct
d
et
e
c
t
i
o
n case: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elij
a
h Newren
t6036: add lots of detail f
o
r
d
i
r
ectory/file c
o
nflic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6042: add
testcas
e
cove
r
i
n
g
l
o
ng
chains of rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah Newren
t6042: add test
c
ase cove
r
ing rename/rename(2to1)
/
delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah N
e
wren
t6042: add
t
e
stcas
e
cover
i
ng
rename/add/delete co
n
flic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
t60
3
6: add
a
failed
c
onfl
i
ct detection case with conflicting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah New
r
en
t
6036: add a
f
ai
l
ed conflict
detection case with submodu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Newren
t60
3
6: add a failed
c
onflict detection ca
s
e with submodu
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Ne
w
ren
t603
6
: ad
d
a
f
a
i
l
e
d
confli
c
t detection cas
e
wi
t
h symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6036: add a fa
i
led
con
f
lict detection c
a
se with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044
:
verify that merges expected to abort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
index_
h
as_changes(): avoid assumi
n
g ope
r
ating on
the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Eli
j
ah Newren
r
e
ad-cache
.
c
:
move index
_
has_cha
n
ges()
f
rom merge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
lijah Newren
t5407: fix test to cover
i
ntended argum
e
nts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
ap
p
ly: fix grammar error in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-r
e
base--mer
g
e: mod
e
rnize
"
g
it
-
$
cmd
"
to "git $cmd
"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
i
jah Newren
Fix
use of stra
t
egy options with inter
a
ctive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newr
e
n
t3418: add testcas
e
sho
w
i
ng problems with reb
a
se -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah Newren
git-rebase: make --al
l
ow-empty-messa
g
e the default
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah N
e
wre
n
t3401: add dire
c
tory rename testcases for reba
s
e
a
n
d
am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Eli
j
ah Newren
g
i
t-
r
ebase
.
txt: document behavioral dif
f
eren
c
e
s
between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newr
e
n
direc
t
ory-r
e
name-detec
t
io
n
.
t
xt:
technical d
o
cs o
n
abili
t
ies
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ijah
N
ewren
git-rebase
.
t
xt: addr
e
ss co
n
fusion between
--no-ff vs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elij
a
h Newren
g
it-r
e
base: error out when incompat
i
bl
e
options passed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
t
3
422: new testca
s
es
for checking when incomp
a
tible
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
E
lijah N
e
wren
gi
t
-re
b
ase
.
sh: update help
m
e
ssages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Ne
w
ren
git-rebase
.
txt: document incompatible options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next