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
rebase: cleanup action handling
2022-10-17
Philli
p
Wo
o
d
rebase: cleanup action h
a
ndling
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
l
l
ip Woo
d
rebase --abort: impr
o
ve reflog messag
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
il
l
ip Wo
o
d
rebase --apply:
m
a
k
e reflog me
s
sages m
a
tch r
e
ba
s
e
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
lip Wood
r
eb
a
s
e
--
a
pply: respect
GI
T
_REFLOG_ACTI
O
N
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phil
l
ip W
o
od
rebas
e
--me
r
g
e
: fix r
e
fl
o
g mess
a
ge afte
r
ski
p
ping
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
Wood
reb
a
s
e
-
-mer
g
e: fix reflog
w
h
en continuing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hillip Wood
t3406: rework
r
eba
s
e
re
f
log tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
W
o
o
d
r
ebase --
a
pply: remove duplicated
code
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
r
e
base --keep-bas
e
:
imply -
-
no-
f
ork
-
po
i
nt
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phill
i
p Wood
r
e
base --keep-base:
imply --r
e
apply-che
r
ry-pick
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase:
factor
out branch_base calculation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase: rename merg
e
_base to branc
h
_base
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase: s
t
ore orig_he
a
d a
s
a
c
om
m
it
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phill
i
p Wo
o
d
rebase: be stricter w
h
en reading state files containing
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t3416: se
t
$EDITOR in subshell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
W
o
od
t3416: ti
g
hten two tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-08-04
Phillip
Wood
test
s
: cache glibc vers
i
o
n
check
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-04-11
Phillip
Wood
tests: make S
A
N
ITIZ
E
=address imply TEST_NO_MAL
L
OC_CHECK
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-31
Phil
l
ip
Wo
o
d
wo
r
ktree
:
ad
d
-z op
t
ion
for list s
u
bcomman
d
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phi
l
l
i
p Wood
terminal
:
restore settin
g
s on
SIGT
S
TP
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
term
i
n
a
l: work aroun
d
macos poll() bug
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
terminal: don't as
s
ume std
i
n is
/
dev/tty
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
term
i
na
l
: use flags for sa
v
e_term()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
ad
d
-
p: dis
a
ble stdin bu
f
f
ering
w
hen interac
t
ive
.
singleke
y
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phil
l
ip
W
ood
termina
l
: set VMIN an
d
VTIME in non-ca
n
onical
m
o
de
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phi
l
l
i
p Wo
o
d
termin
a
l: pop signal handl
e
r when ter
m
inal is
r
e
s
t
o
red
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Philli
p
Wood
terminal: a
l
ways rese
t
termina
l
when read
i
ng
w
itho
u
t
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
P
hillip W
o
o
d
xdif
f
: hand
l
e
a
llocati
o
n
f
ailu
r
e when merging
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phi
l
lip
Wood
xdiff: refa
c
t
o
r a
functi
o
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phi
l
lip Wo
o
d
xdiff: handle
allocatio
n
failure i
n
patience diff
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip W
o
od
xdiff: fix a memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
ll
i
p
Wood
rebase -
m
: don'
t
fork g
i
t check
o
ut
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
llip Wood
r
ebas
e
--appl
y
: set
ORIG_HEAD
corre
c
tly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
eb
a
se --a
p
ply: fix r
e
flog
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
res
e
t_head
(
): take s
t
r
u
ct rebase_head_opts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
Wood
rebase: c
l
eanup r
e
s
e
t
_head
(
) c
a
ll
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip W
o
od
crea
t
e_autostash(): remove unneeded parameter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
h
i
llip Woo
d
reset
_
he
a
d(): make de
f
au
l
t_reflog_act
i
on op
t
iona
l
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
llip Woo
d
reset_hea
d
(): factor out ref updates
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
hill
i
p
W
ood
r
e
set_h
e
a
d
(
)
: r
e
mov
e
ac
t
ion param
e
ter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phill
i
p Wood
rebase --apply: don't run post-c
h
eckout hook if there
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phi
l
lip W
o
od
reb
a
s
e:
do
n
ot
rem
o
ve untracke
d
files on
che
c
kout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
ip Wood
re
b
a
s
e
:
p
ass correct arguments t
o
p
ost-checko
u
t hoo
k
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phi
l
l
i
p Wood
t5403
:
refactor
r
ebase post-checkout hook tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phill
i
p Wood
r
e
base:
f
actor out chec
k
out for u
p
t
o
da
t
e
br
a
nch
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phi
l
lip Wo
o
d
buil
t
in add -
p
: fix
h
unk
splitting
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wood
t
3701: clean up hunk sp
l
itti
n
g
tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
W
ood
diff --color-moved
:
intern
s
t
rings
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
h
illip W
o
od
diff: use designa
t
ed initiali
z
ers
f
o
r
emit
t
ed_
d
iff_symbol
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phill
i
p
W
o
o
d
diff
-
-color
-
moved-ws=a
l
l
ow-indentation-chang
e
: imp
r
ove
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phil
l
ip Wood
diff --color-moved: stop
c
l
earing potential m
o
ved
b
locks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff -
-
c
olor-moved: s
h
rink potenti
a
l moved bl
o
cks
a
s
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phill
i
p Woo
d
diff --color-moved: unify moved block growth functions
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --color-moved: c
a
ll comparison
f
unction direct
l
y
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
d
i
ff --color-moved-ws=allow-inden
t
ati
o
n-change
:
simplify
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
h
illip W
o
od
dif
f
: simplif
y
allow
-
i
n
dent
a
tion-change
de
l
ta calc
u
l
ation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip W
o
od
diff --col
o
r-m
o
ve
d
: avoid fal
s
e short l
i
ne mat
c
hes
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wo
o
d
dif
f
--color-moved=zebra
:
fix alterna
t
e coloring
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff
-
-
c
o
lo
r
-moved:
r
ewind w
h
en discardin
g
pmb
commit
|
commitdiff
|
tree
2021-12-09
P
hi
l
lip Wo
o
d
dif
f
--colo
r
-mov
e
d
:
factor o
u
t functio
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
h
illip
W
ood
diff --color-moved: clear all flags o
n
blocks t
h
a
t
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --c
o
l
o
r-move
d
:
add perf t
e
sts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-01
Phillip Wood
xdiff: impleme
n
t
a zealous diff3, or
"
zdiff3"
Signed-off-by:
Phillip Wood
<phillip.wood123@gmail.com>
commit
|
commitdiff
|
tree
2021-11-19
P
h
illip Wood
xdiff: si
m
plif
y
comparison
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
Phillip Wood
xdiff: avoid unnecessar
y
memo
r
y allocations
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
P
h
illi
p
W
o
od
diff histogram: intern str
i
ngs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-03
P
h
illip Wood
r
ebase -i:
f
ix re
w
ording
with --c
o
mmitte
r
-date-is-au
t
hor
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-18
Phillip Wood
t1092: run "rebase -
-
apply"
without "-q" in
t
esting
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-07
Phill
i
p W
o
od
sparse
i
nd
e
x: fix u
s
e
-
after-free bug
in cache
_
tree_verify()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phillip Wood
rebase: fix t
o
do-list
r
ereadin
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Philli
p
Wood
sequencer
.
c:
f
a
ctor out a functi
o
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phillip Wood
rebase: der
e
ference tags
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
P
hill
i
p Wood
rebase
:
use lo
o
kup_c
o
mmit_ref
e
rence_b
y
_na
m
e(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phil
l
ip
Wood
rebase: use ou
r
sta
n
dard error ret
u
rn val
u
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407: rework rebas
e
--qu
i
t tes
t
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Ph
i
llip
Wood
t3407
:
st
r
engthen rebase
-
-abort test
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
P
hillip Woo
d
t3407: use
t
est_pat
h
_is_
m
i
s
sing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip W
o
od
t3407:
re
n
ame a
v
ariable
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip
W
o
o
d
t
34
0
7
:
use
t
es
t
_cmp
_
rev
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t
3
407: use
test_commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t
3
407: r
u
n tests i
n
$TEST_DIRECT
O
RY
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phillip Wood
rebase -r: fix
merge -c wit
h
a
m
erge st
r
ategy
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phillip
Wood
r
e
base -r: don'
t
write
.
git/MERGE_MSG when fast-for
w
arding
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phi
l
lip Wood
rebase -i: a
d
d an
o
ther reword test
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-20
P
h
illip
Wood
rebase -r: ma
k
e
'merge -c' behave like rew
o
r
d
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Phi
l
lip Wood
rebase --co
n
tinu
e
: remove
.
g
i
t/MERGE_MSG
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Ph
i
ll
i
p Wood
r
e
b
a
se --apply: re
s
tore s
o
me tes
t
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Phillip Wood
t
3
4
0
3
:
fix
com
m
it aut
h
orship
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phillip
W
ood
pat
i
ence
d
i
f
f
: re
m
ov
e
un
u
sed
v
ariable
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
P
h
ill
i
p Wood
patience di
f
f: remove unnecessary string compa
r
i
sons
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phillip Wood
word diff:
h
andl
e
zero length matches
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-29
Phillip Wood
r
e
base -
i
: commen
t
o
u
t
squash!/fixup
!
subjects f
r
om
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-21
Ph
i
llip Wood
sequencer: facto
r
out code to
append squash message
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-21
P
hill
i
p Wood
r
e
b
a
s
e -i:
only
write f
i
xup-message when it's
needed
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phillip Wo
o
d
reba
s
e
-
i
: simplify get_revi
s
ion_ranges()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
P
hillip Wood
rebase
-
i: use struct object_id when writing state
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phillip W
o
o
d
rebase -i:
use struct object_id ra
t
her t
h
an looking
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phillip Wood
rebase
-i: sto
p
over
w
riting ORIG_H
E
A
D buf
f
er
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-09-09
Phill
i
p Wood
a
dd -p: fix editing o
f
intent-to-add
paths
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-09-08
P
h
illip Wood
add -p: fix memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next