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
Merge branch 'dk/zsh-git-repo-path-fix'
2024-04-18
Phi
l
li
p
W
ood
rebase -m
:
f
i
x
-
-signoff
w
ith
c
onflicts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Ph
i
l
li
p
Wood
sequencer: store commi
t
messag
e
in p
r
i
v
a
te context
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Phillip Wo
o
d
se
q
uenc
e
r: move c
u
rrent fixup
s
to private c
o
nte
x
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Phillip Wood
s
e
quencer: st
a
rt
removing pr
i
vate fields from pub
l
ic API
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Phillip
W
ood
sequencer: always free "struct re
p
lay_opts"
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
Phillip Wood
t3428:
r
estore
coverage f
o
r "ap
p
ly" back
e
n
d
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
Phillip Wood
t
342
8
: use test_commit_mes
s
age
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
P
h
illip Woo
d
t3428: mo
d
ernize t
e
s
t
s
etup
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phil
l
i
p
Wood
c
h
eckout: fi
x
int
e
racti
o
n
betwe
e
n
-
-conflict
a
nd -
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Philli
p
Wood
che
c
kout
:
cleanup --conf
l
ict=<style>
parsing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phillip Wood
merge options:
a
dd a confl
i
ct style member
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Ph
i
llip Wood
me
r
ge-ll: intr
o
duce LL_MERGE_OPTIONS_INIT
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
P
hillip Wood
xdif
f
-inte
r
fac
e
:
r
efact
o
r par
s
ing of merg
e
.
conflic
t
style
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-27
Phillip Woo
d
reba
s
e -i:
s
top setting G
I
T_CHERRY_PI
C
K_HE
L
P
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-09
Phillip Woo
d
prune
:
ma
r
k
rebase
a
uto
s
t
ash
and orig
-
h
e
ad
a
s reac
h
able
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-07
Phill
i
p Wo
o
d
t140
0
: use show-ref to check pseud
o
re
f
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-07
Phillip Wood
show-
r
ef --v
e
rif
y
:
ac
c
ept pseudorefs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-11-09
Phillip
W
o
o
d
unit tests: add TAP u
n
it
t
e
s
t
frame
w
ork
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phil
l
i
p Wood
r
ebase -i: fix adding failed com
m
and to the todo li
s
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Philli
p
Wood
rebase --cont
i
nue: refus
e
to comm
i
t after fa
i
l
ed command
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
rebase: fix r
e
written
list for fa
i
l
ed pick
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip
W
ood
s
equenc
e
r: f
a
ctor o
u
t
p
art
of pick_comm
i
t
s()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
sequencer: use rebas
e
_
path_mes
s
age()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
rebase -i:
r
emo
v
e patch
file
a
fter
c
on
f
lict resolution
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wo
o
d
rebase -i: move u
n
lin
k
() calls
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-08-10
P
hillip Wood
t4053: avoi
d
race w
h
en
k
i
l
ling bac
k
gr
o
u
nd proce
s
ses
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-08-03
Phillip
W
ood
rebase -
-
ski
p
: fix commi
t
message
cl
e
an up when
s
kipping
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
Phillip Wood
diff --no-inde
x
: support
r
eading from
n
amed pi
p
es
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
Phillip Wood
t
4054: test dif
f
--no-inde
x
w
i
t
h
std
i
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
Phillip
W
ood
diff
--no-index: die o
n
error reading
s
t
din
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
Ph
i
llip Wo
o
d
d
i
ff --no-ind
e
x
:
r
efuse to compare s
t
di
n
t
o
a direct
o
ry
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-06-26
Phillip Wood
apply: im
p
rov
e
error messag
e
s
w
hen re
a
di
n
g patch
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Ph
i
llip W
o
od
r
ebase: re
m
ove
a
coup
l
e
o
f redundant strategy tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wood
re
b
as
e
-
m
: fix
seria
l
i
zati
o
n
o
f st
r
at
e
g
y
opt
i
ons
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Ph
i
l
l
ip Wood
r
e
base -m: cleanup -
-
strategy-option hand
l
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phillip W
o
od
sequencer
:
use struct str
v
ec to store merg
e
strategy
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wood
rebase:
s
t
op reading
a
nd
w
riting unn
e
cessary strateg
y
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Ph
i
llip Wood
wildmatc
h
:
hide int
e
rnal
ret
u
rn values
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Phillip
W
ood
w
i
ldm
a
tch: av
o
id unde
f
i
n
e
d behavior
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Phill
i
p Wood
wildmatch:
fix
e
xp
o
n
e
ntial beha
v
io
r
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-23
Phillip
W
ood
rebas
e
-i: fix parsing of "fixup -C<
c
ommit
>
"
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-23
Phillip Wood
rebase -i: match whol
e
word
i
n
is_c
o
mmand()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-21
Ph
i
llip Wo
o
d
reba
s
e
-i: ch
e
ck label
s
a
nd refs when pars
i
ng todo
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-13
Phillip Wood
rebase: clean
u
p
"--exec"
option handling
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-04
Phillip Wo
o
d
ci(github
)
: restore "print
t
est failures
"
step
n
ame
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
Phi
l
lip W
o
od
s
e
quencer: tighten label lookups
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
P
h
illip Wood
sequencer:
u
ni
f
y label loo
k
up
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip W
o
od
g
i
t_pars
e
_signed
(
): avoid
i
nteg
e
r ove
r
f
l
o
w
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
P
hill
i
p Wood
confi
g
:
req
u
ir
e
a
t
least one digit whe
n
pars
i
ng numbers
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
g
i
t_parse_
u
n
s
ign
e
d: r
e
ject
n
egative values
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
P
h
illip W
o
o
d
rebase: stop
e
xporting GIT_RE
F
LO
G
_
ACTIO
N
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Phillip W
o
od
s
e
q
uencer: stop exporting GIT_REFLOG_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip Wo
o
d
rebase: clean
u
p
ac
t
ion handling
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
r
e
base
--abort: improve r
e
f
l
og message
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
llip
W
ood
rebase --ap
p
ly: mak
e
re
f
log
messages m
a
tch rebase
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
ill
i
p W
o
od
rebase --apply:
r
es
p
ect
G
IT_REFLOG_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
W
ood
rebas
e
--merge: fix r
e
flog message after skip
p
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase --m
e
rg
e
: fix refl
o
g when c
o
ntinuing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t3406: rework r
e
base reflog t
e
st
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
reb
a
s
e
--apply: re
m
ove du
p
licated code
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip W
o
od
reb
a
se
-
-keep-
b
a
se: imply --no-fork-point
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase
--k
e
e
p
-
b
ase:
imply --reapply-che
r
r
y-pi
c
ks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
llip Wood
rebase
:
fact
o
r
o
ut branch_base calculat
i
o
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
i
ll
i
p Wood
r
e
b
ase: r
e
n
a
me mer
g
e_base to branch_
b
ase
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
Wood
rebase: store
o
rig_hea
d
a
s
a
comm
i
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wo
o
d
r
e
base: be strict
e
r when reading state files containing
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
Wood
t
3416: set
$
ED
I
TOR in s
u
bs
h
el
l
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
lip
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: r
e
move
r
edun
d
ant
te
s
t
case
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-05
P
h
i
l
lip W
o
od
s
sh signing: return
an erro
r
wh
e
n signature cannot
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-03
Phillip Wood
mailinfo -b: fix
a
n out
of bou
n
ds
a
ccess
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-08-04
Phil
l
ip Wood
tests: cache glibc
v
e
rsion che
c
k
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip
W
ood
xdiff: introduce XDL_ALLOC_GROW()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phil
l
ip W
o
od
xdiff: introduce XDL_CALLOC_ARRAY()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
P
h
i
llip Wood
xd
i
ff: intro
d
uce
x
dl_calloc
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Ph
i
llip Wood
x
diff: i
n
troduce XDL_ALLOC_ARRAY()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-04-11
Phillip
Wood
tests: ma
k
e SA
N
ITIZE=address imply TEST_NO_MAL
L
OC_CHECK
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-31
Phillip Wood
workt
r
ee: add -z
opt
i
on for l
i
st sub
c
omma
n
d
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
P
h
illip Wood
terminal: restore se
t
t
i
ngs on SIGTSTP
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wo
o
d
ter
m
inal: work around m
a
cos
p
o
ll() bug
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
terminal: don'
t
assume stdin is /d
e
v/tty
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
term
i
nal: use flags for save_term()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
P
h
ill
i
p Wood
a
d
d
-p: di
s
abl
e
stdin
buffering when interactive
.
si
n
glekey
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phill
i
p Wood
terminal: set VMIN
a
nd VTIME in non-canon
i
cal
mo
d
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wo
o
d
terminal: p
o
p s
i
g
n
al han
d
ler
when t
e
r
m
inal is
r
estor
e
d
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phill
i
p Wood
ter
m
i
n
al: alw
a
ys reset terminal whe
n
reading without
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
P
hillip Wood
xdiff: handle al
l
ocat
i
on fai
l
u
r
e whe
n
merging
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip
Wood
xdiff: refactor a function
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip W
o
od
x
diff: hand
l
e al
l
oc
a
tion failure
i
n
pati
e
nce diff
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
xdiff: fix a memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase -m: don'
t
f
ork git checkout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
Wood
rebase -
-
apply: set
O
RI
G
_HEAD correctly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebas
e
--apply: fix reflog
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phill
i
p Wood
r
eset_head
(
): take struct
rebase_head_
o
pts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase: cleanup res
e
t_head
(
) calls
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
Wo
o
d
c
r
e
a
te_auto
s
ta
s
h(): rem
o
ve unnee
d
e
d parameter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
llip Wood
reset_head():
m
a
k
e default_
r
eflog_action op
t
ional
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phi
l
lip Wood
reset_head(): factor out ref updates
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
e
s
et_head(
)
: remove action
parameter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
h
illip Wo
o
d
rebase --apply: don't
run post-checkout
h
o
o
k if there
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next