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 --continue: refuse to commit after failed command
2023-09-06
Phi
l
lip Wood
rebase --continue:
ref
u
s
e
t
o
co
m
mit
a
fter fai
l
ed
c
ommand
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-09-06
Philli
p
Wood
rebase: fix rewritten list for fa
i
led
pick
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-09-06
Phillip
W
o
o
d
sequencer: factor
out part o
f
pick_co
m
mits()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-09-06
Phillip
W
ood
se
q
uencer: use re
b
ase_
p
ath
_
message()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
re
b
ase -i: remove
p
atch file
aft
e
r conflict
r
e
s
o
lution
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
rebase
-i: move unlink() calls
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Phi
l
lip Wood
r
e
base: remove a couple of redund
a
nt str
a
t
e
g
y t
e
sts
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Philli
p
Wood
rebase -m: fix serialization
o
f
strategy options
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Phillip
W
ood
rebase -m: cl
e
anup --st
r
a
te
g
y
-option ha
n
dling
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Ph
i
l
lip W
o
od
sequencer:
use struct st
r
vec to store merge
s
t
r
a
tegy
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-04-10
Ph
i
llip Wood
rebase: stop re
a
di
n
g
an
d
writing
u
nnece
s
sa
r
y strategy
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-03-20
Phillip Wood
wildmatc
h
:
hide i
n
t
ernal
r
e
turn values
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-03-20
Phillip
W
ood
wildmatch: avoid
undefined
b
ehavior
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-03-20
Phillip W
o
od
wildmat
c
h
:
fix
e
xpon
e
n
t
ial b
e
h
a
vio
r
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-02-23
Phillip Wood
reb
a
se -i:
f
ix parsing of "fixup
-C<c
o
m
m
it>"
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-02-23
Phillip W
o
od
rebase -i: m
a
tch whole word i
n
is_c
o
mmand()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-02-21
Phi
l
lip
Wood
r
ebase -i: chec
k
labels and
r
e
f
s
when p
a
rs
i
ng t
o
do
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-01-13
Phillip Wood
rebas
e
: cle
a
nup "--exec" option hand
l
ing
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2023-01-04
Phillip Wood
ci(
g
ithub):
re
s
tore "print test f
a
il
u
re
s
" s
t
e
p
name
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-11
Phillip Wood
s
equencer: tigh
t
en label lookups
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-11
Phillip Wood
s
equenc
e
r:
unify labe
l
looku
p
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-10
Phil
l
i
p
Wood
git_parse_signed(): avoid integer overf
l
o
w
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-10
Phillip Wood
config: req
u
i
r
e at least one
digit w
h
e
n
parsing numb
e
rs
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-10
Phillip
W
ood
git_p
a
r
s
e_u
n
signed: reject negative valu
e
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-09
Phil
l
ip Wood
r
ebase: stop exporting
GI
T
_REFLOG_ACTI
O
N
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-11-09
Phi
l
l
ip Wood
sequencer: stop
ex
p
orting GIT_REFLOG_ACTI
O
N
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase:
cleanup action h
a
ndling
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
W
ood
r
ebase --abo
r
t: improve
reflog
m
essage
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
P
hil
l
ip Wood
rebase --apply: make refl
o
g messages
m
atch reba
s
e
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
lip Wood
reba
s
e --
a
pply: re
s
pect GI
T
_REFLOG_ACTI
O
N
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
li
p
W
ood
rebas
e
-
-
merge: fix re
f
l
o
g messag
e
after sk
i
ppin
g
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
llip Woo
d
reba
s
e --mer
g
e: fix ref
l
og whe
n
continu
i
ng
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t
3
406:
rework rebase
r
eflo
g
tests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase --apply:
remove
d
uplica
t
ed
c
ode
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
P
h
i
llip Wo
o
d
re
b
ase -
-
keep
-
base:
imply --no-fork-poin
t
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phill
i
p Wood
re
b
ase --kee
p
-base: imply --r
e
apply-cherry-picks
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
Wo
o
d
rebase: facto
r
ou
t
bra
n
ch_base c
a
lcul
a
t
ion
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase: re
n
ame
merge_bas
e
to
b
ranch_base
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase: s
t
ore orig_h
e
ad
as a com
m
it
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip W
o
o
d
reba
s
e: be stricter whe
n
reading state files
c
ontaining
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
lip
W
ood
t341
6
: set $EDITOR in
su
b
s
h
e
l
l
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t3
4
1
6
: tighten
t
wo test
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-10
Phill
i
p Wood
t3435: remove
redunda
n
t test case
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-05
Phi
l
lip W
o
od
ssh s
i
gni
n
g: return an
error when s
i
gnature can
n
ot
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-10-03
Phillip
W
ood
mailinfo -b: fix an out
o
f bounds
a
cc
e
ss
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-08-04
Phillip
W
ood
tests:
c
ache
g
li
b
c
v
ersion check
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdi
f
f: introd
u
ce XDL_ALLOC
_
GROW()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wo
o
d
xdiff: introduce XDL_CALL
O
C
_
ARRAY()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-07-08
P
h
i
llip Wood
xdiff: introduce xdl_call
o
c
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wo
o
d
xdi
f
f
: intro
d
uce
XDL_A
L
LOC_ARRAY()
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-04-11
Phil
l
ip Wood
t
ests: make SANITIZE=
a
ddress imply
TEST_NO_MALL
O
C_
C
HECK
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-31
Phil
l
ip Wood
worktree: add -z option fo
r
list subcommand
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
t
e
rminal:
r
e
store settings on SIGTSTP
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
te
r
minal: work aroun
d
macos pol
l
() bug
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-16
P
hillip Wood
termin
a
l:
d
on't assume stdin is /dev/t
t
y
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-03-16
Phil
l
ip W
o
od
term
i
nal: use flags for save_term
(
)
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-23
Phil
l
ip Wood
add -p
:
dis
a
ble stdi
n
buf
f
er
i
ng w
h
e
n
interact
i
ve
.
si
n
glekey
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
termina
l
: set VMI
N
and VTIME in non-canoni
c
al mo
d
e
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wo
o
d
termi
n
al:
p
op s
i
g
nal handler when terminal is re
s
tored
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-23
Phill
i
p Wood
t
e
rminal: a
l
ways reset terminal wh
e
n
rea
d
ing without
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
xdiff:
h
andle alloc
a
tion failure whe
n
m
e
r
g
i
n
g
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-16
Phill
i
p Wood
x
d
iff: refa
c
t
or a functio
n
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
xdiff: handle
a
ll
o
c
a
ti
o
n
f
a
ilure in pati
e
nce diff
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-02-16
Ph
i
l
l
ip Wood
xdiff
:
f
ix
a memory
l
eak
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
P
hillip Woo
d
rebase
-
m:
don't fork
gi
t
checkout
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
i
p
Wood
r
e
base --app
l
y: set ORIG_HEAD correctly
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
P
h
ill
i
p W
o
od
r
ebase --apply: fix r
e
flog
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
ip Wood
reset_head(
)
: tak
e
s
tr
u
ct rebase_hea
d
_op
t
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
reba
s
e: cleanup reset_hea
d
() ca
l
ls
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phi
l
li
p
Wo
o
d
create_a
u
tostash(): remove unneeded parameter
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
ip
W
ood
reset_head
(
): ma
k
e
d
e
fa
u
lt_reflog_actio
n
opti
o
n
al
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
ip Wood
re
s
et_head(): fact
o
r out
r
ef updates
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phi
l
lip
Wood
reset_he
a
d(): remove a
c
ti
o
n parameter
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase
-
-apply: don
'
t run po
s
t-ch
e
c
k
out
h
ook if there
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase
:
do not r
e
move untracked files
on ch
e
cko
u
t
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebas
e
: pass correct ar
g
uments t
o
p
ost-checkout
hook
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Philli
p
Wood
t5403
:
refactor rebas
e
p
ost-c
h
e
ckout h
o
ok tests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
ip Wood
rebase: fa
c
tor
o
ut
c
heckout for
u
p to date branch
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-12
P
h
illip Wood
b
u
i
ltin add -p: fix
h
u
nk
s
plit
t
ing
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wo
o
d
t3
7
01: clean up hunk spli
t
tin
g
t
ests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --color-moved: in
t
ern strings
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff:
u
se designated init
i
aliz
e
rs
for emitte
d
_diff_symbo
l
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
P
h
il
l
ip
W
ood
d
i
f
f
-
-
c
olor-mo
v
ed-w
s
=
a
llow-ind
e
ntation-change: improve
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip W
o
od
di
f
f
--color-mo
v
ed: stop clearing
potential
m
oved b
l
o
c
k
s
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Philli
p
Wood
diff --color-moved: shrink potential
moved
blocks as
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff -
-
colo
r
-m
o
ved: unify moved block gr
o
wth
functions
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
di
f
f
-
-co
l
or-
m
oved:
ca
l
l
comparison function
d
ir
e
ctly
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
P
h
ill
i
p Wood
diff --color-moved-w
s
=allow
-
indentatio
n
-
c
han
g
e
:
simplif
y
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Ph
i
llip Wo
o
d
diff: simpli
f
y allow-inde
n
tation-change delta calculation
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --c
o
lor-
m
o
v
ed: avoid
f
a
l
se short line matches
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
P
h
i
l
lip
W
ood
dif
f
--color-moved=
z
ebra: f
i
x a
l
ternat
e
co
l
oring
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
d
i
ff
-
-colo
r
-moved: rewind wh
e
n di
s
carding pmb
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wo
o
d
diff -
-
color-m
o
ved: factor ou
t
fun
c
tion
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip W
o
od
diff --color-moved: clear all
f
lags on bl
o
cks that
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Woo
d
diff --color-moved: add perf
t
ests
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-12-01
Phillip Woo
d
x
dif
f
:
i
m
plement a zealous diff3, or
"zdiff3"
commit
|
commitdiff
|
tree
2021-11-19
Phillip Wood
xdiff: simplify c
o
mparison
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-11-19
Phillip Wood
x
diff: avoid un
n
ecessary memory
allo
c
ations
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-11-19
Phill
i
p
Wood
dif
f
hi
s
togram: intern strings
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
2021-11-03
P
hi
l
l
i
p Wood
rebase -i: fix
r
e
wording with --c
o
mmitter-d
a
te-
i
s-author
.
.
.
Signed-off-by: Phillip Wood <
phillip.wood@dunelm.org.uk
>
commit
|
commitdiff
|
tree
next