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
t4054: test diff --no-index with stdin
2023-07-05
Phill
i
p
W
ood
t4
0
54: test diff --no-index wit
h
stdi
n
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-07-05
P
hillip Wood
di
f
f --no-
i
n
d
ex: die on error reading stdin
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-07-05
P
hillip Wo
o
d
d
i
ff -
-
no
-
i
n
dex: refuse
t
o compa
r
e std
i
n
t
o
a d
i
r
ect
o
ry
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Philli
p
W
o
od
rebase: rem
o
ve a coup
l
e of redundant
strategy
t
ests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wood
rebase -m: fix serializat
i
on of
s
t
ra
t
e
gy options
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wood
re
b
ase
-
m: cl
e
a
n
up --s
t
rate
g
y-option han
d
l
ing
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wood
seq
u
enc
e
r: use struc
t
s
trv
e
c
to s
t
ore merge strate
g
y
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wood
rebase: stop r
e
ad
i
ng
a
nd writ
i
ng unn
e
cessary strate
g
y
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-03-20
Phillip Woo
d
wildmatch:
h
ide internal return values
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-03-20
Philli
p
Wood
wildma
t
ch: avoid unde
f
in
e
d behav
i
or
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-03-20
Phillip Wood
w
i
ldmatch: fix e
x
ponent
i
a
l be
h
avior
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-02-23
Phillip
Wood
rebase
-
i: fi
x
parsing of "
f
i
x
u
p
-C<commi
t
>"
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-02-23
Philli
p
Wood
r
e
base -i: match wh
o
le word in is_command()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-02-21
Phillip Wood
rebase -i:
c
h
eck labels and refs when parsing todo
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-01-13
Phil
l
ip Woo
d
rebase:
c
leanup "-
-
e
x
ec"
o
pti
o
n
h
and
l
in
g
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-01-04
Phillip Wood
ci
(
github):
r
e
store "print
t
est failure
s
" step name
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-11
Phillip Wood
s
e
q
uencer: tig
h
ten lab
e
l looku
p
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-11
P
h
i
l
lip Wood
s
e
quen
c
er: un
i
fy label
lookup
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
git_p
a
rse_signed(
)
:
avoid integer ov
e
r
flow
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
config: require at l
e
ast
o
ne digit whe
n
parsing
numbers
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-10
P
h
illip Wo
o
d
git_parse
_
unsigned: r
e
ject
n
egative values
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-09
Phillip Wood
rebase: stop
e
xpor
t
ing GI
T
_
R
EFLOG_ACTION
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-09
Phillip W
o
od
seque
n
cer:
s
top exportin
g
GIT_RE
F
LOG_ACTION
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phil
l
ip
W
ood
r
ebase: cleanup action ha
n
dling
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Woo
d
rebase
-
-a
b
ort:
im
p
rov
e
reflog mes
s
a
ge
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
lip Wood
rebase
--app
l
y: make reflog messages match rebase
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
Wood
r
e
bas
e
--app
l
y: res
p
ect GIT_REFLOG_ACTI
O
N
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
W
oo
d
rebase
-
-
m
erg
e
: fi
x
reflog mess
a
ge after skipping
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
l
lip Wood
reba
s
e
-
-mer
g
e:
fix re
f
log when c
o
n
tin
u
i
n
g
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t340
6
: rework rebase reflog tests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
P
hillip
W
ood
rebase
-
-
apply: remove duplica
t
ed
c
ode
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Woo
d
rebase --kee
p
-
b
ase: imply --no-fork-point
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
r
e
base
--keep-
b
ase: imply --rea
p
p
l
y
-cherry-picks
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phil
l
ip Wood
rebase: fac
t
or out branc
h
_ba
s
e calculation
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase:
rename
m
erge_ba
s
e t
o
branch_base
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip Wood
rebase:
s
tore or
i
g_head as a com
m
it
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phill
i
p W
o
o
d
r
e
base: be stricter
when reading state
f
iles contain
i
ng
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t
3416:
s
e
t
$EDITOR in
subshell
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
l
ip
Wood
t34
1
6: tighten
two tests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-10
Phill
i
p Wood
t3435: remove redundant
test case
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-05
Phillip Wood
ssh
s
igning:
r
eturn an error when signature ca
n
not
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-03
Phill
i
p Woo
d
m
a
ilinfo -
b
: fix an
o
u
t
of
bounds access
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-08-04
Philli
p
Wood
tests:
c
ache gli
b
c ver
s
ion
check
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-07-08
Phillip
Wood
xd
i
f
f
: intr
o
duce
X
DL_ALL
O
C
_
G
R
OW()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-07-08
Phillip
W
o
od
xdif
f
: introduce XDL_CALLO
C
_
A
RRAY()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdiff:
i
ntroduce xdl_calloc
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdiff: introduc
e
XDL_ALLOC_ARRAY()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-04-11
P
h
i
l
li
p
Wood
tests: make SANITI
Z
E=add
r
e
s
s imply TEST_NO_MAL
L
OC_C
H
ECK
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-31
Phil
l
i
p
Wood
worktree:
add
-z o
p
tion for list subcommand
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-16
Phi
l
lip W
o
o
d
terminal: restore settings on
SIGTSTP
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wo
o
d
terminal: work around
m
a
c
os poll() bug
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-16
Phil
l
ip Wood
ter
m
i
nal:
do
n
'
t
assume stdin i
s
/dev/tty
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
t
er
m
inal: us
e
f
l
a
gs for
save_term()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
add -p: disable
s
tdin buffering
w
hen interactive
.
single
k
ey
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-23
Phil
l
i
p Wood
ter
m
inal:
s
et VMI
N
a
n
d
VT
I
ME in non-can
o
nical
m
ode
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-23
Phillip W
o
od
termi
n
al: pop signal handler
whe
n
terminal is r
e
stor
e
d
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-23
Phil
l
ip Woo
d
terminal: always reset terminal when re
a
d
i
ng without
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-16
Phill
i
p Wood
xdiff:
h
andl
e
allocation failure when merging
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-16
Phil
l
ip Wood
xdiff
:
refactor a function
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-16
Phi
l
lip Wood
xdiff: handle all
o
c
at
i
on
failure in patience diff
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-16
P
hilli
p
Wood
x
diff
:
fix a
m
emory leak
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
e
base -m: don't fo
r
k git checkout
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Philli
p
Wood
rebase --apply: set
ORI
G
_
H
EAD cor
r
ectly
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
Wood
rebase --apply: fix reflog
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Philli
p
Wood
reset_head()
:
tak
e
st
r
uct reb
a
s
e
_head_opts
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
llip Wood
reba
s
e:
c
leanup reset
_
head
(
)
ca
l
ls
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
llip
W
o
o
d
create
_
autostash(): remove unneed
e
d
param
e
ter
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
W
ood
rese
t
_he
a
d(): mak
e
def
a
ult_reflog_action
o
ptional
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Philli
p
Wood
reset_head(): factor out r
e
f updates
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip W
o
od
reset_h
e
ad
(
): remove action
p
arameter
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
P
h
il
l
ip Wood
reb
a
s
e
--
a
p
p
l
y: don't run pos
t
-checkout hook if there
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
P
hil
l
ip
Wo
o
d
r
ebase: do not rem
o
v
e untra
c
ked
f
iles
on ch
e
cko
u
t
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
W
ood
rebas
e
: pass cor
r
e
ct
a
rguments to post-ch
e
c
k
ou
t
hook
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Woo
d
t5
4
03:
refactor re
b
a
s
e
post
-
chec
k
out hook tests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip W
o
od
rebase:
f
a
ctor o
u
t check
o
ut for up to date
branch
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wood
built
i
n
add -p:
f
ix hunk splittin
g
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wood
t3701: clean up hunk spl
i
tt
i
ng test
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --color-
m
o
v
ed: intern stri
n
g
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phil
l
ip Wood
diff
:
u
se designated in
i
tializers
f
or emitte
d
_diff_symbol
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phill
i
p Wood
diff -
-
co
l
or
-
moved-
w
s
=
a
llow-in
d
entation-chan
g
e
:
i
mprove
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Ph
i
llip W
o
od
diff
-
-
color-moved: stop clearing potential moved blocks
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
P
h
illip Wood
d
i
f
f
-
-color-m
o
ved:
shr
i
nk po
t
enti
a
l mo
v
ed
blocks as
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phi
l
lip Wood
diff
-
-color-
m
ov
e
d: uni
f
y mo
v
ed block growth functi
o
ns
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Philli
p
Wood
diff --colo
r
-moved:
call compa
r
ison
f
un
c
tion directly
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff -
-
colo
r
-moved-ws=allow-
i
n
dentation-chan
g
e: simplify
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Ph
i
llip Wood
dif
f
: simplify allow-ind
e
nt
a
t
i
on-change delta calculatio
n
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phil
l
ip Wood
diff -
-
color-moved: av
o
id fa
l
se short
l
in
e
mat
c
hes
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Ph
i
l
l
ip Woo
d
d
iff -
-
col
o
r
-moved=zebr
a
: fix altern
a
t
e
colorin
g
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
Woo
d
diff --co
l
or-
m
oved: rewind when discarding pmb
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wo
o
d
diff --color-mov
e
d: factor out functio
n
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phi
l
lip Wo
o
d
dif
f
--color-mo
v
ed: clear all flags
on
b
lo
c
ks that
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wo
o
d
diff --c
o
lo
r
-
m
ove
d
: add perf tests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-01
Phillip Wood
x
diff:
i
m
ple
m
ent a zealou
s
diff3, or "zdiff3"
commit
|
commitdiff
|
tree
2021-11-19
P
hillip Wood
xdif
f
: si
m
p
l
ify comparison
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-11-19
P
hil
l
ip Wood
xdiff: avoid unnecessary memory al
l
oca
t
io
n
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-11-19
Phillip Wood
diff histogram: intern string
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-11-03
Phi
l
lip
W
ood
r
ebase -i: fix re
w
ording with --commi
t
ter-
d
at
e
-is-
a
uthor
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-10-18
Phillip Wood
t1092: run "
r
ebase -
-
apply" without "-q" in te
s
ting
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-10-07
Phillip W
o
o
d
s
pa
r
s
e ind
e
x
: fix use
-
after-fr
e
e bu
g
in cache_tree_verify()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-09-24
Philli
p
Wood
re
b
as
e
:
f
ix todo-list rereading
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
next