repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
unicode: update the width tables to Unicode 12.1
2019-02-14
E
l
i
jah N
e
wren
git-reba
s
e
.
t
x
t:
u
p
date to r
e
flect
merge
now implement
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-10
Elijah
Newren
g
i
t
-
sh
o
w-ref
.
txt: fix ord
e
r of flags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-01-07
Elijah Newren
r
ebase: impl
e
ment --merg
e
v
i
a
t
he interact
i
ve machinery
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Ne
w
ren
rebase: define l
i
nearization o
r
dering an
d
enforce it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
git-
l
egacy-rebase: s
i
mplify unnecessary
triply-
n
ested if
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
lijah N
e
wren
g
i
t-rebase
,
sequencer: exten
d
-
-
quiet option for the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
am, reb
a
se--merge: do no
t
overlook --skip'ed commits
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elija
h
Newren
t
5407: add a test demonstrating how i
n
teractive
han
d
les
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
E
l
ijah Newren
rebase: fix incompatible options
err
o
r message
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-28
Elijah Newren
r
e
base
:
make builtin
and
legacy script error messages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-12-09
Elijah Newren
git-rebase
.
txt: update
n
ote ab
o
ut direc
t
ory
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
li
j
a
h
N
e
w
r
e
n
fast-export: add a -
-
show
-
orig
i
nal-ids option to show
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Newren
fast
-
import: re
m
ove
u
nmai
n
t
ained dup
l
icate doc
u
m
e
n
t
ation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
fa
s
t
-expor
t
: add --re
f
erence-excluded-
p
arents
optio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah Ne
w
ren
fast-ex
p
ort: ensure we e
x
p
ort requested
r
efs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah N
e
wren
fa
s
t-ex
p
ort:
wh
e
n using paths, av
o
id corrupt stream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah N
e
wren
f
a
s
t-e
x
po
r
t: move commit rewriting logic into a func
t
ion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
E
l
ijah Newren
fast
-
e
x
p
o
rt: avoid
dying when filtering by
path
s
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
El
i
jah Newren
f
ast-e
x
po
r
t: u
s
e value fr
o
m corre
c
t en
u
m
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elija
h
Newr
e
n
g
i
t-f
a
st-export
.
tx
t
:
clarify mis
l
ea
d
i
n
g
d
ocu
m
en
t
at
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Eli
j
ah Newren
git-fast
-
i
mport
.
txt: fix documentation for
-
-quiet
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-17
Elijah
N
e
w
r
en
fast-export: convert sha1
t
o
o
id
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elija
h
Newren
t603
6
,
t
6043: increase code c
o
v
erage for file collision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
E
l
ijah Newren
merge-rec
u
r
s
ive: impr
o
v
e rename/rena
m
e
(
1
t
o
2)/add[/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recursive: use
ha
n
dle_file_colli
s
i
on for
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recursive:
improve handling for ren
a
me/r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Eli
j
ah
N
ewre
n
merge-recur
s
iv
e
: fix ren
a
me/a
d
d con
f
lict handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merg
e
-
r
ecursive: new function for bet
t
er coll
i
ding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah Newren
merge-recur
s
iv
e
: increase marker length w
i
t
h depth
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah N
e
w
ren
t6036, t6042: t
e
stcases for rename collision of
a
lrea
d
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-11-08
Elijah New
r
en
t6042: add tests for
con
s
isten
c
y in file
c
ollision
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-22
Elijah Newren
fsck
:
m
o
ve fs
c
k_head_link() t
o
get_de
f
ault_heads()
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newr
e
n
merge-recursive: avoid showing conflicts with merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-10-18
Elijah Newren
merge-recu
r
s
i
ve:
impro
v
e
a
uto
-
merging
messa
g
es with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-27
Elijah Newren
co
m
mit
:
f
i
x er
r
oneous BUG, '
m
ultiple renames o
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah New
r
en
merge
-
r
e
cursive: rena
m
e merge_f
i
le_1() and mer
g
e
_content()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elija
h
New
r
en
me
r
ge-recursive
:
r
e
m
o
ve final
rem
a
ining
caller
of merge_fi
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
E
lijah N
e
wren
merg
e
-recur
s
ive: a
v
oid wrapper function
when unnecessary
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-20
Elijah Newren
mer
g
e-recursive
:
set
paths c
o
rrectly when t
h
ree-wa
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-13
Elijah Newren
seq
u
encer: fix --a
l
low-e
m
p
t
y-me
s
sage beha
v
ior,
m
a
k
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
El
i
jah N
e
wren
update-ref:
a
llow
-
-no
-
deref w
i
th --stdin
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-12
E
l
ijah Newr
e
n
update-ref: fix type of upd
a
te_flags variable to match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
Elijah Newren
rerere: av
o
id buffer
ove
r
run
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-11
El
i
jah
N
ewren
t4200: demo
n
strate rerere s
e
gfau
l
t on
s
pecially cra
f
t
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-09-05
E
l
ijah Newr
e
n
Remove superfluous trailing semicolons
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Elijah Ne
w
r
e
n
am: avoid directory renam
e
detect
i
o
n
when c
a
l
l
ing recursive
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
E
l
ija
h
Newren
m
e
r
ge-recurs
i
ve: add ability to tur
n
off direc
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-30
Eli
j
ah Newren
t
3
401:
a
dd ano
t
her
director
y
re
n
ame
t
est
c
ase for
re
b
ase
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newren
Re
m
ove
f
orward declara
t
ion of
a
n enum
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah N
e
wren
compat/precompose_utf8
.
h: use more common i
n
clude guard
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
El
i
jah
N
ewr
e
n
urlmatch
.
h: fix incl
u
de gua
r
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Eli
j
a
h N
e
wren
Move d
e
finition
of
enum branch
_
track
f
rom cac
h
e
.
h to
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Newr
e
n
alloc:
m
ake alloca
t
e_alloc
_
s
tate and clear
_
alloc_state
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-15
Elijah Ne
w
ren
Add miss
i
ng in
c
lu
d
es and
forward de
c
l
a
ra
t
ions
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elija
h
Newren
g
i
t-update
-
i
ndex
.
tx
t
: reword possibl
y
confusing
exa
m
pl
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t740
6
:
avo
i
d u
s
ing test_m
u
st_fail
for commands
other
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t740
6
: prefer test_* helper functions
t
o test -[f
e
d
s]
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
E
lijah Newren
t7406
:
avo
i
d having git c
o
m
m
ands
upstre
a
m of a pi
p
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406:
simplify
by using di
f
f --name-only inst
e
ad
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-08
Elijah Newren
t7406: fix cal
l
that was
f
ailing for
t
he wrong rea
s
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-08-06
El
i
jah Newren
t
3031: update te
s
t d
e
scri
p
t
i
on
to mention des
i
r
e
d be
h
a
vior
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
Elijah Newren
read-cache: f
i
x directory/f
i
le con
f
lict handling in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-31
El
i
jah Newr
e
n
t1015:
d
emonstrate
d
i
rectory/fil
e
c
o
n
flict recover
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-27
Elijah N
e
wren
merge-recursive:
preserve
skip_work
t
ree
bit when necessary
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
Newren
t7
4
05
:
verify 'm
e
rge --abort' works after submod
u
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
l
ijah
Newren
t7405:
add a d
i
rect
o
r
y
/submodule
conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah N
e
wren
t7405
:
add a file/subm
o
dule conflict
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah
N
ewren
merge:
fix misleading pre-merge che
c
k documentation
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Eli
j
ah
New
r
en
merge-recursive: enforce rul
e
that in
d
e
x ma
t
che
s
head
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
E
lijah Newren
t6044: add more
t
e
s
t
cases with staged chang
e
s before
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Ne
w
ren
mer
g
e-recursive: fix assumption that head tree being
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elija
h
Newre
n
m
erge-recursive:
m
ak
e
su
r
e
w
hen we
say we abort that
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
El
i
jah Newren
t6044: add a t
e
stcase for ind
e
x
matching
head, wh
e
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newren
t6036:
a
dd a fai
l
e
d conflict dete
c
t
ion cas
e
: regular
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-06
Elijah
Newren
t
6
036
:
a
d
d
lots of deta
i
l
for dir
e
ctory/file confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
w
r
e
n
t6042: add te
s
tcas
e
covering long chai
n
s
o
f rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
ijah
N
ewren
t6042: add t
e
stcase cover
i
ng rename/rename(
2
t
o
1)/delete
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
El
i
jah Ne
w
r
e
n
t
6
042: ad
d
testca
s
e cove
r
ing rename/ad
d
/delet
e
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
0
36
:
add a failed con
f
lict detec
t
io
n
c
a
se w
i
th conflict
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
jah N
e
wr
e
n
t6036:
a
dd a
failed conflict detection case w
i
t
h subm
o
dule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t603
6
: a
d
d a
fa
i
led c
o
n
fl
i
ct detection case with s
u
bmodule
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t
6
0
36: add a f
a
iled conf
l
ict detection ca
s
e
w
i
th
s
y
mlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newre
n
t6036: add a failed co
n
flict detecti
o
n case with symlink
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044: verify that merges ex
p
ec
t
ed to abort actually
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
inde
x
_has_chan
g
es(): avoid assuming o
p
eratin
g
o
n
the_index
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-07-03
E
lijah N
e
wren
re
a
d
-cache
.
c:
m
ove index_ha
s
_changes() from
m
erge
.
c
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
Elijah Newren
t5407: fix
test
to
cov
e
r intended
a
r
g
uments
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-28
E
l
ijah Newren
apply: fi
x
gramma
r
er
r
or in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-
r
ebase--merge: modernize "git-$cm
d
"
to "git $cmd"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
lijah Newren
Fi
x
use of strategy opt
i
ons with inter
a
ctive rebases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elija
h
N
e
wren
t3418
:
add testcase
s
howing p
r
ob
l
ems with rebase -i
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
git-r
e
base: make
--a
l
lo
w
-emp
t
y-m
e
s
s
age the defau
l
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
El
i
jah N
e
wren
t3
4
01: ad
d
dire
c
tory
r
ename tes
t
c
a
se
s
for re
b
ase an
d
am
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Newren
git-reba
s
e
.
t
xt: d
o
c
u
ment
behavio
r
al dif
f
erenc
e
s between
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
ren
di
r
ectory-r
e
name-detection
.
t
xt:
t
echnical docs on abilit
i
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah Ne
w
r
en
git-
r
ebase
.
txt: a
d
dress
c
o
nfus
i
on betwee
n
--no-ff
v
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
Elijah
Newren
git-rebase: error out when incompatib
l
e options pas
s
ed
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-27
E
l
ij
a
h Newre
n
t3422: n
e
w testcases
f
or checking
when
in
c
om
p
a
t
ibl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah New
r
en
g
i
t-rebase
.
sh: upd
a
t
e
help messages a bit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-26
Elijah Newren
git
-
rebas
e
.
txt: doc
u
m
ent inc
o
mp
a
tible option
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next