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 'rj/add-p-typo-reaction'
2024-04-18
Phillip Wood
rebase -m: f
i
x --s
i
gno
f
f with co
n
flicts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Phillip Wood
sequen
c
er: st
o
re com
m
it message in private con
t
ext
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
Phillip
Wo
o
d
sequenc
e
r: move current fixups to private conte
x
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
P
hillip Wo
o
d
se
q
uencer: star
t
removing priv
a
t
e
fields from public API
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-18
P
hillip Wood
seq
u
e
n
c
e
r: always fr
e
e
"
s
t
ruct replay_op
t
s"
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
Phillip
Wood
t34
2
8: r
e
store cover
a
g
e
for "apply"
b
ack
e
nd
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
Phillip Wood
t3428: u
s
e test_commit_mess
a
ge
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-04-09
Ph
i
lli
p
W
o
od
t3428: mod
e
rni
z
e
t
est s
e
tup
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phillip Wood
check
o
ut: fix interaction between --conflict a
n
d
-
.
.
.
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=<s
t
yle> parsing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phillip Woo
d
merge option
s
: add a c
o
n
fl
i
ct s
t
yle m
e
mber
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phillip Woo
d
m
e
r
ge-
l
l: introduce L
L
_MERGE_OPTIONS_INIT
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-03-14
Phillip Wood
xdiff-
i
nterface:
r
e
fa
c
to
r
parsing of
m
erge
.
con
f
lictsty
l
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-27
P
hillip Wood
r
eba
s
e
-
i
:
s
top s
e
tting G
I
T_CHERRY_PICK
_
HEL
P
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-09
Phillip
W
ood
prune: mark rebase autos
t
ash an
d
orig-he
a
d as reac
h
able
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-07
Phi
l
l
i
p Wood
t
14
0
0:
use show-ref
to che
c
k
ps
e
udo
r
efs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2024-02-07
Phillip Woo
d
show
-
ref --verify:
accept p
s
eudore
f
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-11-09
Phillip Wo
o
d
u
n
it tes
t
s
: add
T
AP unit test framework
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phil
l
i
p Wood
r
ebase -i:
f
ix adding faile
d
c
ommand to the todo
list
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip Wood
rebase --continue: refuse to
c
ommit after fai
l
ed command
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Philli
p
Woo
d
rebase: f
i
x rewritten l
i
st for f
a
iled pick
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phi
l
lip Wood
sequencer: fac
t
or out p
a
rt of pick_commits()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phillip
W
ood
seque
n
cer:
use rebase_p
a
th_message()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phill
i
p Wood
r
ebase -
i
:
remov
e
p
a
tch fil
e
a
f
t
er conflict reso
l
u
tion
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-09-06
Phill
i
p Wood
rebase
-
i:
move unlink() calls
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-08-10
Phillip Wood
t4053:
avoid race when
k
illing backgro
u
nd processes
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-08-03
Phil
l
ip Wo
o
d
rebase --s
k
ip
:
fix
c
ommit messa
g
e clea
n
up when skippi
n
g
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
Phillip Woo
d
diff --no-
i
nd
e
x
:
support reading from named pipes
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
P
h
i
llip W
o
od
t
4054: test di
f
f --n
o
-index with
s
tdin
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
P
h
illip Wood
diff --no-
i
ndex
:
die on error
readin
g
stdin
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-07-05
P
hil
l
i
p
Wood
diff --no-index: r
e
fuse to comp
a
r
e
stdin to a dire
c
tory
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-06-26
P
h
illip Wood
apply: improve
e
r
r
o
r messages whe
n
readin
g
patch
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Philli
p
Woo
d
rebase:
r
emove a couple of redundant s
t
r
ategy
t
ests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phi
l
lip W
o
od
rebase -m: fix seri
a
lization of strat
e
g
y options
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
P
hi
l
lip Wood
rebase -m: cleanup --strategy-o
p
tion han
d
lin
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phillip
W
ood
s
e
quencer: use struct strvec to sto
r
e mer
g
e str
a
tegy
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-04-10
Phillip Wood
rebase: sto
p
r
eadin
g
and
w
r
iting unnece
s
sary strategy
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Phillip Wood
wildmatch: hide
int
e
rnal return values
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Phillip Wood
wildmatch: avoid unde
f
ined beha
v
ior
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-03-20
Phillip Wood
wildmat
c
h: fix ex
p
o
nenti
a
l behavior
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-23
P
h
illip
W
oo
d
rebase -i: fix parsing o
f
"fixup -
C
<c
o
mmit>"
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-23
Phillip Wood
rebase -i: match
w
hole
w
ord
i
n
is_command()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-02-21
Phill
i
p
Wood
rebase
-i:
ch
e
ck
labels and re
f
s
w
h
en
p
arsi
n
g tod
o
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-13
Phillip Wood
reba
s
e
: cleanup "--exec"
option handl
i
ng
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2023-01-04
Phill
i
p
Wood
ci(gith
u
b)
:
resto
r
e "pr
i
n
t te
s
t fa
i
lure
s
"
s
t
e
p
n
am
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
Ph
i
llip Wood
s
e
quen
c
er:
tighten label lookup
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-11
Ph
i
lli
p
Wood
s
e
quence
r
:
unify
lab
e
l lookup
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
P
h
illip W
o
o
d
git_parse_sig
n
ed(): a
v
oi
d
integer overflow
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip
Wood
confi
g
:
require at least one
d
i
g
it when par
s
ing numbers
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-10
Phillip
Wood
git_parse_unsign
e
d: rej
e
ct negative values
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Phi
l
lip Wood
rebase: stop exporting GIT
_
REFLOG_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-11-09
Phillip Wo
o
d
s
equencer: stop exp
o
r
t
i
ng GIT_RE
F
LOG_A
C
TION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
l
lip Wood
rebase: cleanup actio
n
handling
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
W
o
o
d
rebase -
-
abort
:
improve ref
l
o
g
mess
a
ge
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip W
o
od
reba
s
e -
-
apply: make
r
eflo
g
m
essages match rebase
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase --
a
pply: respect GIT_REFLOG_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase
-
-merge: f
i
x reflog message after skipping
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip
Wo
o
d
rebase --merge:
fix reflog when continuing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t3406: re
w
ork rebase reflog tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phi
l
lip
W
ood
re
b
ase --
a
pply
:
remove duplicate
d
co
d
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wo
o
d
re
b
a
s
e -
-
ke
e
p-
b
ase: impl
y
-
-no-f
o
rk-po
i
n
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
W
o
od
rebase --keep-base:
impl
y
--reappl
y
-cher
r
y-picks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
i
l
lip Wood
rebase: facto
r
out
b
ra
n
ch_base
calc
u
lation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
Wood
reba
s
e:
r
e
name merge_base to branch_base
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phill
i
p Wood
rebase: store orig_head as a commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
llip Wood
rebase: be stricter when
reading stat
e
files containing
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
W
o
o
d
t
3
416: s
e
t
$EDITOR in s
u
bshell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Ph
i
llip Wo
o
d
t341
6
: tigh
t
e
n
two tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-10
Philli
p
W
o
od
t3435: remove
r
edundant
t
est case
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-05
Phillip
W
ood
ssh signing: return an error when
si
g
nature ca
n
not
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-03
Ph
i
llip Wood
mail
i
nfo -b: fix an out of
b
ound
s
access
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-08-04
Phillip W
o
od
tests: cache
g
libc versio
n
check
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdif
f
:
introduce XDL
_
ALL
O
C_GROW()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Woo
d
x
d
iff: intr
o
duce XDL_CALLOC_ARRAY()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
P
h
illip Woo
d
xdiff:
i
ntroduce xdl_calloc
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
x
d
iff: int
r
oduce XDL_AL
L
OC_ARRAY()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-04-11
Ph
i
l
lip Wood
te
s
ts: make SANITIZE=a
d
d
re
s
s imply
T
EST_NO_
M
ALLOC_CHECK
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-31
P
h
illip Wo
o
d
w
o
rktree: add -
z
optio
n
for list
s
u
bcommand
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Ph
i
l
lip
W
o
od
t
e
rmina
l
: restore settings on
SIGTSTP
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Philli
p
W
o
od
terminal: work around macos poll() b
u
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
P
h
i
llip Wood
terminal:
don't assu
m
e
s
t
din is /dev/tty
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
P
h
illip Wood
terminal: use
flags for save
_
ter
m
()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Philli
p
Wood
add -
p
:
d
isable st
d
in buffe
r
i
ng wh
e
n int
e
ractive
.
si
n
glek
e
y
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip W
o
o
d
terminal:
s
et VMI
N
a
nd VT
I
ME in non-canonical m
o
d
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
termi
n
a
l: po
p
signal handler when terminal is r
e
stored
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
termina
l
: always re
s
et term
i
nal whe
n
reading
wit
h
o
u
t
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Philli
p
Wood
xdiff: handle allocation
f
ail
u
re when merg
i
ng
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phill
i
p Wood
x
di
f
f: refactor a function
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip W
o
od
xdiff
:
h
andle
a
llocation failur
e
in
pa
t
ience 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
reb
a
se -m: don't fork git checkout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
h
illip Wood
rebase --apply: se
t
ORIG_HEAD correctly
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
P
hi
l
li
p
W
o
od
reset_head()
:
take s
t
ru
c
t rebase
_
head_opts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
W
o
o
d
rebase: clea
n
up reset
_
head() calls
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
create_autostash(): rem
o
v
e
u
nneeded par
a
meter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
Wood
reset_hea
d
(): m
a
ke defau
l
t_reflog_action
o
ptio
n
al
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phil
l
ip Wood
reset_head():
f
a
c
t
or out re
f
updat
e
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wo
o
d
reset_head(): remove action parame
t
er
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip
Wood
re
b
ase --
a
pply: don't run post-chec
k
out hook i
f
there
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next