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
sequencer: clear state upon dropping a become-empty commit
2020-03-11
Elijah
N
e
w
r
en
sequencer
:
clear state up
o
n dropping a becom
e
-empty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase:
rename the
t
wo prima
r
y reb
a
se backends
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
Newren
rebase: c
h
an
g
e the defau
l
t backe
n
d
f
rom "am"
t
o "
m
e
rge"
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
ewren
rebase: m
a
ke the bac
k
en
d
con
f
igura
b
le
v
i
a co
n
f
ig
s
ett
i
ng
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
Newren
r
e
b
a
s
e tests: repeat s
o
m
e
tests using the merge
backend
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Ne
w
ren
rebase tests: mark
tests s
p
ecific to
the am-bac
k
e
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: drop '-i' from the refl
o
g
for interactiv
e
-based
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
g
i
t-prom
p
t
:
cha
n
ge the prompt f
o
r inte
r
active-based
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
El
i
j
a
h N
e
wren
rebase: add an --
a
m option
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah Newren
rebase: move
i
n
c
o
m
patibility checks betwee
n
b
ackend
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elij
a
h Newren
g
i
t
-reb
a
se
.
txt:
a
d
d
m
ore detail
s
about behavi
o
r
a
l difference
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
El
i
jah Newren
re
b
ase:
allow more types of rebases to f
a
st-fo
r
ward
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah
N
ewren
t3432: m
a
ke these
t
e
s
ts wo
r
k
w
ith
eith
e
r am or merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
E
l
i
j
ah Newren
reb
a
se: fix hand
l
i
ng of restrict
_
revisi
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Eli
j
ah Newren
rebas
e
: m
a
ke s
u
re t
o
pass along the quiet
f
lag to the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah N
e
wren
reb
a
se, sequencer: r
e
m
o
v
e t
h
e broken
GIT_Q
U
IE
T
h
a
ndling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elij
a
h N
e
w
ren
t3406: simplify
an already si
m
pl
e
tes
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
Elijah N
e
wren
reb
a
se (interactive-bac
k
end): fix
h
andling of commits
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-02-16
E
li
j
a
h Newre
n
rebase (interactive-backend): ma
k
e --k
e
e
p-em
p
ty the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-17
E
l
ijah Newre
n
t3404: dir
e
ctly
test
the behavior of
i
nter
e
st
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-17
Elijah
Newren
git-rebase
.
txt: update description o
f
--allow-empty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2020-01-02
Elijah
N
ewren
merge-recursive: rem
o
ve unnecessary oid_eq function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-20
Elijah New
r
en
reb
a
se
:
fix s
a
vin
g
of --sign
o
f
f st
a
t
e
f
o
r am
-
based
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
Elijah N
e
wren
dir: cons
o
l
i
date simila
r
cod
e
i
n
trea
t
_directory()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
E
l
ijah Newre
n
dir:
s
ynchronize treat
_
leading_path() and rea
d
_directory_rec
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-19
Elijah
N
ewr
e
n
dir: fix ch
e
cks on common
p
r
efix directory
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-18
Elijah New
r
e
n
t3434:
mark suc
c
es
s
ful tes
t
as such
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Eli
j
ah
N
ewren
dir: break part of read_
d
ir
e
ctory_r
e
cursiv
e
() out
for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Eli
j
ah Newren
dir: exit before wildca
r
d fall-through
if there i
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah
N
ewren
dir: rem
o
ve stray quote
cha
r
a
cter in
c
o
mm
e
nt
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newren
Re
v
ert
"
dir
.
c: m
a
ke
'
g
it-status --ignored'
w
ork wit
h
in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-12-11
Elijah Newre
n
t3011:
d
emo
n
strate
d
i
r
ect
o
ry t
r
av
e
rsal failures
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah
Newren
Fix spelling errors
in no-longer-updated-from-upstream
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah
N
ewren
multi
m
ail: fix a fe
w
simple spellin
g
errors
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newre
n
sha1dc: fix tr
i
vial co
m
ment spellin
g
error
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fi
x
spelling e
r
rors
i
n test
c
ommands
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spelling err
o
rs in mes
s
ag
e
s
sho
w
n to
users
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
E
l
ijah
N
ewren
Fix
s
p
e
lling errors in names of t
e
sts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
Elijah Newren
Fix spelli
n
g errors in comments of testca
s
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-10
E
lijah Newren
Fix spelling err
o
rs in code comments
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elijah Newren
t6024: modern
i
ze style
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ijah Newre
n
name-hash
.
c
:
r
e
move dupli
c
a
t
e word in c
o
mment
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
Elij
a
h
Newren
h
a
shm
a
p:
f
ix d
o
c
u
menta
t
ion misu
s
es
o
f -> versus
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
E
l
ijah Newren
g
it-filter-bra
n
ch
.
txt: c
o
rrect
a
rgum
e
nt name typo
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
E
lij
a
h New
r
e
n
F
ix spe
l
ling errors in
documentation
outside of Documentati
o
n/
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-07
E
lijah Newren
Doc
u
mentation: fix a b
u
nch
o
f ty
p
os, b
o
th old and n
e
w
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
Elijah Newren
RelNotes/2
.
24
.
0: f
i
x self
-
c
o
ntradictory note
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-11-02
Eli
j
ah Newren
R
e
lNotes/2
.
24
.
0: typofix
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Eli
j
ah Newren
t60
4
[236]: do
n
ot run
setup in sepa
r
ate test
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Elija
h
N
ewren
merge-recursive: fi
x
m
e
rging
a
subdir
e
c
t
o
ry into
t
he
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-23
Elijah Newre
n
merge-recursi
v
e: clean up
get_renamed
_
dir_po
r
tion()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-08
Elijah Newren
merg
e
-recu
r
sive: fix the fix to
t
he diff
3
c
ommon ances
t
or
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
E
l
ijah Newren
fast-expo
r
t: handle nes
t
e
d
tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
t9
3
50: add tests for
tags of things
o
ther than a commit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newren
fast-export:
allow us
e
r to request tag
s
be
m
a
r
ke
d
wi
t
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elijah Newr
e
n
fa
s
t-ex
p
o
r
t
: add s
u
ppor
t
for --import-marks-if-exist
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Elija
h
N
e
wr
e
n
f
a
st-import: add support
for
ne
w
'
a
li
a
s' com
m
a
n
d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
Eli
j
ah Newr
e
n
fast-i
m
port: allow tag
s
to be ide
n
tified
b
y ma
r
k
l
abels
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-03
E
lijah N
e
wren
fa
s
t
-
impo
r
t: fix ha
n
dling of deleted tags
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Elijah
Newren
merge-recu
r
sive:
f
ix the d
i
ff3 common ancestor label
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-10-02
Elijah Newren
d
ir:
s
peci
a
l case chec
k
for the possi
b
ilit
y
t
h
a
t
pathsp
e
c
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-28
Eli
j
ah Newren
f
a
st-expo
r
t: fix e
x
por
t
ing a tag and nothing e
l
s
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
lijah Newren
c
lean:
f
ix theo
r
et
i
cal path corruption
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h Newren
c
l
ean: rewrap overly
l
o
n
g line
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clean: av
o
id remo
v
ing untracked fil
e
s i
n
a
nested git
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
clea
n
: disam
b
ig
u
ate
th
e
def
i
niti
o
n of -d
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
Ne
w
ren
git-
c
lean
.
txt:
d
o not
c
lai
m
we will delete files with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
dir: ad
d
commentary explaining match_pathspec_i
t
em
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
El
i
j
a
h Newren
dir: if our pathspec mig
h
t match files
u
nder a
d
ir
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
El
i
j
a
h Newren
d
i
r: make the DO_MATCH_SUBMODULE
c
ode reusable for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah
N
e
wre
n
dir:
a
lso chec
k
direct
o
rie
s
f
or matchin
g
pathspe
c
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
E
l
ijah
Newren
dir: fix off-by
-
one error in match_pathspec_item
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elij
a
h N
e
w
r
en
d
i
r: fix typo in commen
t
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-17
Elijah Newren
t7300: a
d
d testcase
s
showing f
a
ilu
r
e to clean specified
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
l
ijah Newre
n
t99
0
2: us
e
a n
o
n-
d
epre
c
at
e
d c
o
mmand for te
s
ti
n
g
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah
Newren
Rec
o
mmend git-filter-rep
o
instead
o
f git-filter-b
r
anch
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
Elijah Newren
t6006:
s
i
mpli
f
y, fix,
an
d
optimi
z
e em
p
t
y message
test
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-05
E
lija
h
Newren
t
3427: a
c
celerate this test by
using fas
t
-exp
o
rt a
n
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-09-01
Elij
a
h Newren
merge-options
.
tx
t
:
cl
a
r
i
fy meaning
of v
a
ri
o
us ff-related
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah N
e
wr
e
n
merge
-
recurs
i
ve: a
l
phabe
t
i
ze
i
nclude list
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Eli
j
ah
N
e
w
r
en
merge-recur
s
ive
:
add sanity checks for relevant merge_options
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah New
r
en
merge-recursive: rename MERGE_RECURSIV
E
_*
to MERGE_VARIA
N
T_*
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-re
c
ursive:
s
plit int
e
r
nal
fields int
o
a separate
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newr
e
n
me
r
g
e-recursive: avo
i
d losing ou
t
put and leaking memory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
l
ijah Newren
merge-re
c
u
rsive: c
o
mment and reorder the merge_options
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newre
n
merge-recursiv
e
:
c
ons
o
lidate unnecessary fields in
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
merge
-
r
e
cursive: move
s
o
m
e definition
s
arou
n
d
to clean
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
merge-rec
u
rs
i
ve: r
e
name merge_op
t
i
ons argument
to
o
pt
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
e
rge-recursive: rename
'
mrtree' to 'resu
l
t_tre
e
'
,
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newren
m
erge-rec
u
rs
i
ve: use common n
a
me f
o
r
a
n
cestor
s
/comm
o
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
El
i
jah Newren
merge-recursive: fix some overly long lines
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newr
e
n
cache
-
tre
e
:
share code between fu
n
cti
o
ns writing an
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newr
e
n
m
erg
e
-recursive: don't
f
orce ex
t
ernal
cal
l
e
r
s to do
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
N
e
wren
m
e
rge-
r
ecursive: remove useless
parameter in merge_
t
rees
(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
E
lijah Newren
merge
-
recur
s
i
ve: exit early if in
d
ex != head
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Ne
w
ren
Ensure i
n
dex
m
atches h
e
ad b
e
f
o
re invoking merge m
a
chinery
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah Newre
n
merge-re
c
ursive:
remove a
n
othe
r
implicit
d
ependency
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elijah
Newren
merge-re
c
ur
s
ive:
f
uture-proo
f
u
pd
a
te_file_fl
a
gs()
a
ga
i
nst
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-19
Elija
h
Newren
merge-r
e
curs
i
ve
:
p
rovide a be
t
t
e
r label for diff3 common
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2019-08-16
Elij
a
h Newren
m
e
rge
-
recursi
v
e
: enforce
o
pt-
>
ancestor
!
= N
U
LL when
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next