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
git-rebase.txt: highlight backend differences with commit rewording
2020-03-11
E
li
j
a
h Newre
n
g
i
t-rebase
.
t
xt: hi
g
hlight backend differences with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-03-11
Elijah N
e
wren
sequencer: clear state upon dropping a beco
m
e-empt
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
ewren
rebase: re
n
ame the two p
r
ima
r
y
r
ebase backends
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
El
i
j
ah
Newren
r
e
base: cha
n
ge the d
e
f
a
ult ba
c
kend fro
m
"am" to "merge"
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
reb
a
se: make th
e
backend co
n
figurable vi
a
conf
i
g
sett
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elija
h
N
ewren
rebase
t
e
sts
:
repeat some t
e
sts
usi
n
g the merge b
a
ckend
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
El
i
jah
Newren
rebas
e
tests: mark tests spec
i
f
ic
t
o t
h
e am-backe
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
Newr
e
n
r
e
base: drop '-i' fr
o
m the ref
l
og for
i
nteract
i
v
e
-base
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah Ne
w
ren
g
i
t-pr
o
m
p
t: ch
a
n
g
e the pr
o
mpt for interac
t
ive-based
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: a
d
d
a
n --am
o
pt
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: mo
v
e inco
m
patibility checks betw
e
en bac
k
end
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
ewren
git-rebase
.
txt
:
add mor
e
details
abou
t
behavioral
difference
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: allow more types
o
f
rebases to fast-forward
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Ne
w
ren
t3432
:
make these tests
w
or
k
with either am or
m
e
r
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: fix ha
n
dling of restrict
_
revision
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah Newr
e
n
rebase: make sure to pass along the quiet flag to the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
E
l
ijah Newren
reb
a
se, seque
n
cer:
r
emove the broken GIT
_
QUIET h
a
ndling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah Newren
t3406: simplify an already s
i
mple te
s
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elij
a
h Newren
r
e
b
a
se (in
t
er
a
ctiv
e
-backe
n
d
): fix h
a
n
d
lin
g
of com
m
its
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
re
b
as
e
(interactive-
b
ackend
)
: ma
k
e --kee
p
-
empty t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-17
El
i
jah
Newren
t3
4
0
4:
d
irectl
y
test the
b
eh
a
vior of i
n
teres
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-17
Elijah Newren
git-rebase
.
t
xt: u
p
date d
e
sc
r
iption of
-
-allow-empty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2020-01-02
E
lijah Newr
e
n
merge-recursive: remove unn
e
ces
s
a
r
y
oid
_
eq functi
o
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-20
Elijah Newren
rebas
e
: fix sav
i
ng
of
-
-
s
ignoff state for am-based
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
d
i
r
: cons
o
lida
t
e similar
cod
e
in treat
_
directory
(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elij
a
h
Newren
dir: synchronize treat_lea
d
ing_path(
)
and read_direc
t
or
y
_r
e
c
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-19
Elijah Newren
dir: fix checks on
common
prefix directory
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-18
Elijah
N
e
wr
e
n
t
343
4
:
mark su
c
c
essfu
l
test as
s
uch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
dir: break
p
ar
t
of
r
e
a
d_direct
o
r
y
_recu
r
si
v
e() o
u
t for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah N
e
wren
dir:
e
x
it before
wildcard fall-thr
o
ugh if there is
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
dir: remove st
r
ay q
u
ote c
h
aracter in co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
Elijah
N
e
wren
Revert
"
di
r
.
c: make
'
g
i
t-status -
-
ignored'
work with
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-12-11
El
i
jah N
e
wren
t3
0
1
1
: de
m
o
ns
t
rate directo
r
y
t
r
aversal failur
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
E
li
j
ah N
e
wren
Fix
spell
i
ng
errors in no-longer-u
p
date
d
-from-upstream
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
multimail: fix
a
few simple s
p
el
l
i
n
g e
r
ro
r
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
El
i
jah New
r
en
sha1dc: fix
t
r
ivial comment spelling error
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah
N
ewre
n
Fix spelling erro
r
s in test comman
d
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elija
h
N
ewren
Fix spe
l
ling
errors in
m
e
ssa
g
e
s
shown to
u
sers
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah New
r
en
Fix spel
l
ing
e
rr
o
rs in
n
ames of
t
ests
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix s
p
elling errors i
n
comments of testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Ne
w
ren
Fix spelling
e
rrors in code commen
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elij
a
h
Newren
t6024: modernize style
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Eli
j
ah Newren
name-hash
.
c: remove duplicate
w
ord i
n
comme
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ijah Newren
hashmap
:
fix
documentation misuses
of
-
> versus
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elija
h
N
ewren
git
-
filter-branch
.
txt: cor
r
ect argument name
typo
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah New
r
en
Fix spelling err
o
rs in d
o
c
u
mentation outside of Docu
m
e
n
tation/
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
Do
c
u
m
entation: f
i
x
a
b
u
nc
h
of ty
p
os, both old and
n
ew
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
E
lijah Newren
RelNotes/2
.
2
4
.
0:
f
ix s
e
lf-contradictory note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-11-02
El
i
jah Newren
R
e
lNotes/2
.
24
.
0
:
typofi
x
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newren
t6
0
4[23
6
]: do not
r
u
n
setup in separa
t
e
te
s
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elija
h
Ne
w
ren
merge-recursive:
f
ix merging a
subdirectory into the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Ne
w
r
en
merge-recursive: c
l
ean up ge
t
_rena
m
e
d_d
i
r_p
o
rtion(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-08
Elija
h
N
e
wren
merge
-
recur
s
ive: fix the fix to t
h
e diff3 com
m
on ancestor
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
en
fast-export:
h
andle ne
s
t
e
d tags
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
a
h Newren
t9350: a
d
d
tests for tags of th
i
ngs other than a commit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-
e
xpo
r
t: allow user
t
o request tags be
mar
k
ed with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h
N
ew
r
en
fast-exp
o
rt: add support for --import-marks-if-
e
xists
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
El
i
jah Newren
fast-import: add s
u
pport for ne
w
'alias' comm
a
n
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elijah New
r
e
n
fast-import: allo
w
t
ags to be identified by mark labels
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-03
Elij
a
h New
r
en
f
a
st-
i
mport: fix ha
n
dling
of deleted t
a
gs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
E
lijah New
r
en
merge-recursive
:
fix
t
h
e diff3 com
m
on ancestor
label
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
dir: special case
c
heck f
o
r t
h
e possibility that pathspec
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-28
Elijah Newren
f
a
s
t
-ex
p
ort: fix exportin
g
a tag
a
nd nothing
e
lse
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
c
l
ean: fix th
e
oreti
c
al path
corruption
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah
N
ewren
clean: rewrap o
v
er
l
y lo
n
g line
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah N
e
wren
clean: avoid re
m
ov
i
ng u
n
tracked files in a neste
d
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
New
r
e
n
clean: d
i
sambigua
t
e the de
f
initi
o
n of
-
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
New
r
en
g
it-clea
n
.
txt: do no
t
c
la
i
m we will
d
elete f
i
l
e
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h
Newren
di
r
: add comm
e
ntary
e
xplaining ma
t
ch_pathspec_item
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elija
h
Newren
dir: if our pathspec m
i
ght match file
s
u
n
der a
dir
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newr
e
n
dir: make th
e
DO_MATCH_SUBMO
D
U
L
E code reusa
b
l
e for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
d
i
r: a
l
s
o chec
k
directori
e
s fo
r
mat
c
hing pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Ne
w
ren
d
ir: fix of
f
-by
-
one error in
m
a
tch_pathsp
e
c_
i
tem
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah New
r
e
n
d
i
r
: fix typo in comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-17
Elijah New
r
en
t7
3
00: ad
d
tes
t
cases showin
g
failure
t
o
clean specified
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
El
i
jah Newr
e
n
t9902: u
s
e a non-d
e
precat
e
d comm
a
nd for test
i
ng
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
lijah N
e
wren
Recommend git-f
i
lter-repo instead of git-filte
r
-branch
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ij
a
h Ne
w
ren
t6006
:
simpl
i
fy, fix, and op
t
imize em
p
ty messag
e
test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t3427: acceler
a
te this
t
est by usi
n
g
fast-expo
r
t and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-09-01
Elij
a
h
N
ewren
merge-options
.
txt: clarify meaning of various
f
f-related
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
merge-recursive: alphabeti
z
e inc
l
ude list
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
merge-
r
ecursive: add san
i
t
y
checks
f
or
relevan
t
merge_options
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah N
e
wren
merge-recursive: rename MERGE_R
E
CU
R
SIVE_*
t
o MERGE_VA
R
IANT_*
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive
:
split internal fi
e
lds into a separate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recu
r
sive: avoid losing o
u
tpu
t
and le
a
king mem
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-recurs
i
ve: co
m
m
e
n
t and reor
d
e
r
the merge_options
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursive: consoli
d
a
te unnecessary fields
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newre
n
m
erge-recursive: m
o
ve
s
ome definition
s
aroun
d
to clean
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Ne
w
ren
merge
-
rec
u
rs
i
ve: ren
a
me merge_optio
n
s argument
to opt
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-recursi
v
e: rename 'mrtree' to '
r
esult_tr
e
e',
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah Newren
m
erge-recursive: use common n
a
me fo
r
ancestor
s
/common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-re
c
ursive
:
fix some overly long
l
i
nes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
c
a
che-tree: shar
e
code between
functi
o
ns writing an
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-
r
ecursive: d
o
n'
t
force e
x
ternal callers t
o
do
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
New
r
en
m
erge-recursive: r
e
move useless param
e
te
r
in me
r
ge
_
trees(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newre
n
merge-recursive: exit
e
arly
i
f
i
n
dex != head
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
Ensur
e
index matches head
befo
r
e invoking merge machinery
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
ewren
m
e
rge-recursive: remove anoth
e
r
implicit
d
ependency
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
m
e
rge-recursi
v
e: futur
e
-proof
update_file_f
l
ags
(
) agai
n
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2019-08-19
Elijah N
e
wren
merge-recursive: pr
o
vide a better label
f
o
r
d
iff3
common
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next