repo.or.cz
/
git
/
gitster.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase -m: cleanup --strategy-option handling
2023-04-10
Phillip Wood
rebase
-
m:
cleanup --strateg
y
-option handling
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wo
o
d
se
q
uenc
e
r:
use st
r
u
c
t strvec to store merge stra
t
egy
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Woo
d
rebase:
s
top reading and wr
i
ting unnecessary strategy
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-23
Phi
l
lip Wo
o
d
rebase
-i:
f
ix parsing
o
f "
f
ixup -C<
c
ommit>"
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-23
P
hillip Wood
rebase -i
:
mat
c
h whole word i
n
is_command
(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-21
Phil
l
i
p
Wood
r
e
b
ase -i:
ch
e
ck labe
l
s and r
e
fs when parsing todo
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-13
Philli
p
Wood
rebase: c
l
eanup "--exec"
opt
i
o
n
handling
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-04
Phillip
W
oo
d
ci(githu
b
)
:
restore "print
t
est failures" step name
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
Phill
i
p
Wood
seq
u
e
ncer: tig
h
ten label lookups
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
P
hill
i
p
Wood
s
e
quence
r
: unify
l
abel lookup
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip
Wood
git_parse_sign
e
d(): avoid integer overflow
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
c
o
n
f
i
g: r
e
quire at least one digit when pars
i
ng numb
e
rs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
git_parse_unsign
e
d: reject negative va
l
u
e
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Ph
i
llip W
o
od
rebas
e
: s
t
op exporting GIT_REFLOG_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Phillip Woo
d
s
equencer: stop exporting GIT_REFLO
G
_A
C
TION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase:
cl
e
anup action h
a
nd
l
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase --abort: improve
reflog message
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
Wood
rebase --a
p
ply: make re
f
log messag
e
s match rebase
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase
-
-apply: respect
G
I
T
_REFLOG_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
W
oo
d
rebase --m
e
rge: fix reflog me
s
sage aft
e
r skipping
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase --merge: fix refl
o
g
when
c
ontinuing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
lip Wood
t3406: rework rebase reflog tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
llip Wood
rebase --app
l
y: remove duplicated code
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wo
o
d
rebase
-
-keep
-
base: imply -
-
no-fork-point
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase
-
-keep-base: impl
y
--re
a
pply-c
h
e
rry-picks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip W
o
od
re
b
ase: factor ou
t
branch_base ca
l
c
ul
a
tion
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
llip Wood
rebase: ren
a
m
e
me
r
ge_base t
o
branch
_
base
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebas
e
: store orig_head as a
c
ommit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip Wood
rebase: be s
t
ricter when r
e
ading sta
t
e
f
il
e
s c
o
ntaining
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t3416: set $EDITOR in subs
h
ell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
Woo
d
t3416: tighten two te
s
ts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-10
P
h
i
llip
W
ood
t
3435: remove redundant test cas
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-05
P
hillip W
o
od
ssh
s
igning: return
an error wh
e
n
si
g
na
t
ure
c
a
n
n
ot
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-03
Phil
l
i
p Wood
maili
n
f
o
-b:
f
ix an out of b
o
un
d
s access
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-08-04
Phil
l
ip Wood
t
e
sts: cach
e
gl
i
bc version check
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
P
hillip
W
o
od
xdiff
:
i
n
troduce XDL_ALLOC_GROW
(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phil
l
ip Wood
xdiff
:
in
t
rodu
c
e XDL_CAL
L
OC_AR
R
AY(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdiff
:
i
n
t
roduce xdl_calloc
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip
Wood
xdiff:
i
ntr
o
d
uce XDL_A
L
L
OC_ARRA
Y
()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-04-11
Phillip Wood
tests: make SANITIZE=
a
ddres
s
i
m
ply TES
T
_NO_MALLO
C
_C
H
ECK
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-31
Phi
l
lip Woo
d
wo
r
ktree: add -z opti
o
n for
l
i
st subco
m
mand
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phill
i
p Wood
terminal: restore s
e
tt
i
ngs on SIG
T
STP
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phill
i
p
W
ood
terminal: work
around macos poll() bug
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip W
o
od
terminal: don't assu
m
e stdin is
/dev/tty
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Philli
p
Wood
terminal: use flag
s
for save_term()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phill
i
p W
o
od
a
d
d -p: di
s
able stdin buffering whe
n
inter
a
c
tive
.
singlekey
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
te
r
minal: set VMIN and VTIME in n
o
n-canonic
a
l mo
d
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phill
i
p
Wood
termin
a
l: pop signal h
a
ndler when terminal is resto
r
ed
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip
W
ood
termin
a
l: always
r
eset te
r
minal wh
e
n reading without
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phill
i
p Wood
xdi
f
f: handle allocation failu
r
e
w
hen m
e
rgi
n
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
P
h
illip Wood
xdiff
:
refac
t
or a function
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Ph
i
llip Wood
xdiff
:
handle
al
l
ocati
o
n fa
i
lure i
n
patience diff
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Ph
i
llip W
o
od
xdiff:
f
i
x a memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
i
p
Wood
rebase
-m: don't f
o
r
k git checkout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebas
e
--app
l
y: set
O
R
IG_HEAD
c
orr
e
c
tly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
i
p Wood
rebas
e
--a
p
p
ly: fix reflog
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
e
set_head(): take struct rebase_h
e
ad_opts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip W
o
od
r
e
base: clean
u
p reset_head() calls
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
ip Wood
create_autosta
s
h()
:
remove unn
e
eded parameter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
reset_head(
)
:
m
a
ke default_reflog_
a
ction optional
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip W
o
od
reset_hea
d
(): f
a
c
tor out ref
updates
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
l
l
i
p
Wood
rese
t
_head(): remove a
c
tion
par
a
meter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
h
il
l
ip W
o
od
rebase -
-
apply: don't
r
un pos
t
-checko
u
t
h
ook if there
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase: do
n
ot remo
v
e
untracked files on
checkout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Philli
p
Wood
rebase: pass correct arguments to post
-
che
c
k
o
ut hook
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
t5403
:
r
e
fac
t
or rebase post-checkout hook tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
e
bas
e
: factor out che
c
k
o
u
t
for up to da
t
e br
a
nch
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wood
buil
t
in add -p: fi
x
hun
k
spli
t
t
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wood
t3
7
01:
clean up hun
k
splittin
g
tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
hillip Wood
diff --color-
m
oved: i
n
tern strings
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phill
i
p
Wood
diff:
use designated initial
i
ze
r
s for emitted
_
di
f
f
_
symb
o
l
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
d
iff --color-moved-w
s
=
a
l
l
ow-i
n
dentati
o
n-change: improve
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff
-
-color-move
d
: stop cl
e
aring potential
mov
e
d bl
o
cks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
dif
f
--co
l
or-moved: shr
i
nk potential moved blocks as
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip W
o
od
diff --color-
m
oved: unif
y
mov
e
d block
g
r
o
wth functions
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phi
l
lip Wood
d
i
ff --color
-
moved: call comparis
o
n
function directly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
W
ood
diff
--co
l
or-m
o
ved-ws=
a
llow-indentation-change:
s
implify
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
d
iff: sim
p
li
f
y allow-indentation-change delta calculation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
W
ood
di
f
f --color-mo
v
ed: avoid false short
line matches
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phi
l
lip Woo
d
di
f
f --color-move
d
=
z
e
bra: fix a
l
terna
t
e
coloring
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phil
l
ip Woo
d
diff
-
-c
o
lor-mov
e
d: re
w
i
nd when
d
isc
a
rding pmb
commit
|
commitdiff
|
tree
2021-12-09
Philli
p
Wood
di
f
f --color-moved:
fac
t
or out
f
unction
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phi
l
lip Wood
diff --color
-
moved:
c
lear all f
l
ags on
bl
o
cks that
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --color-mo
v
ed:
add perf tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-01
Phillip
Wood
xd
i
ff: implement a zealous d
i
ff3,
o
r
"zdi
f
f3"
Signed-off-by:
Phillip Wood
<phillip.wood123@gmail.com>
commit
|
commitdiff
|
tree
2021-11-19
Phill
i
p Wood
xdiff: simpli
f
y
c
omparison
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
P
hill
i
p
Wood
xdiff:
av
o
i
d unne
c
essary memory allocations
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
P
h
i
l
lip Wood
d
iff hi
s
togram: i
n
tern
s
trin
g
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-03
Ph
i
llip
W
o
od
rebase -i: fix
rewording with -
-
c
o
mmitter-d
a
t
e-is-author
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-18
P
hillip Wood
t1092: run "r
e
base --ap
p
ly" without "-
q
" in testin
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-07
Phillip Woo
d
sparse i
n
dex: fix use-after-free bug in ca
c
h
e_
t
ree_verify()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phillip Wood
re
b
as
e
:
fix todo-list rereading
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Ph
i
llip
W
ood
s
e
quencer
.
c
:
factor
o
ut a function
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phillip Woo
d
rebase: dereference tags
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
P
h
i
llip
W
ood
rebase: use
l
ookup_com
m
it_refere
n
ce_by_name()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
P
h
i
llip Wood
rebase: use our stan
d
ard
e
rr
o
r
r
eturn val
u
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phill
i
p
Wood
t
3407: rework rebas
e
-
-quit te
s
ts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407:
s
tren
g
then rebase --abort te
s
ts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
P
hillip Wood
t34
0
7
:
use te
s
t_path_i
s
_missing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407: rename a variable
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next