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
sequencer: stop exporting GIT_REFLOG_ACTION
2022-11-09
Philli
p
Wood
sequencer: s
t
op exp
o
r
t
i
n
g
GIT_REFLOG_A
C
TIO
N
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip Wood
rebase:
c
leanup action ha
n
dl
i
ng
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Woo
d
rebase --abor
t
:
i
m
pro
v
e
reflog me
s
sage
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
Wood
rebase --app
l
y: mak
e
reflog messages match rebase
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase
-
-apply:
r
espect GIT_REFLOG_ACTION
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
Wo
o
d
reba
s
e --merge:
fix reflog message after ski
p
pin
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase --merge: fix reflog wh
e
n continuing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t
3406: rework rebase reflog tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phill
i
p Wo
o
d
rebase --app
l
y: re
m
ove d
u
plicated
code
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
h
illip Wood
rebase
-
-kee
p
-ba
s
e: imply
-
-
no-fork-point
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
re
b
ase --keep-base:
i
mp
l
y --re
a
pply-c
h
erry
-
picks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hillip Wo
o
d
re
b
a
s
e: f
a
ctor out branc
h
_base calcu
l
ation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Philli
p
Wo
o
d
rebase: rename m
e
rge_base to branch_
b
ase
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip
W
o
o
d
rebase: st
o
re ori
g
_head as a commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
rebase: be stricter
when re
a
di
n
g stat
e
files conta
i
ning
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
P
hillip
W
ood
t3416
:
set
$EDITOR
i
n
subshell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-17
Phillip Wood
t3416: tighten two te
s
ts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-10
Phillip Woo
d
t3435: remove r
e
d
u
nda
n
t te
s
t c
a
s
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-05
Phi
l
lip Wood
ssh sig
n
ing
:
return a
n
error when signature c
a
n
no
t
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-10-03
Philli
p
Wood
mailinfo -b: fix a
n
out of bounds access
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-08-04
Philli
p
Wood
tests: cache
g
l
ibc v
e
rsion check
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdiff: introduce
XDL_ALLOC_GRO
W
(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Ph
i
l
l
ip Wood
x
d
iff:
i
ntroduce X
D
L
_
CALLOC_
A
RRAY()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
xdiff:
int
r
o
d
uce xdl_ca
l
loc
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-07-08
Phillip Wood
x
diff: introduce XDL_ALLOC_ARRAY()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-04-11
P
h
illip Wo
o
d
tes
t
s: make
S
ANITIZE=addr
e
ss imp
l
y TEST_NO_MALLOC_CHECK
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-31
Phillip
W
ood
work
t
r
e
e:
a
dd -z option for list subcommand
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phil
l
ip Wood
terminal:
r
estore settings on SI
G
TS
T
P
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
P
h
illip Wood
terminal: work around macos poll() bu
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phillip Wood
terminal:
don'
t
assume
stdi
n
is /de
v
/tty
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-03-16
Phill
i
p Wo
o
d
termi
n
al
:
u
se flags
for save_term()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Philli
p
Wood
add -p: disable stdin bufferi
n
g when interact
i
ve
.
s
i
ng
l
ekey
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phill
i
p Wood
t
e
rmina
l
: set
V
MIN and VTIME
i
n
non-canonical mode
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip Wood
termin
a
l: pop sig
n
al han
d
l
er when terminal i
s
restored
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-23
Phillip W
o
o
d
term
i
n
al:
a
lways rese
t
termi
n
al when read
i
ng without
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
xd
i
f
f: handle al
l
ocati
o
n
failure
w
hen me
r
ging
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Philli
p
W
ood
x
d
iff:
r
efact
o
r a functi
o
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wood
x
d
iff
:
handle allocation failure i
n
pat
i
e
n
ce diff
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-02-16
Phillip Wo
o
d
xdi
f
f: fix a
m
emory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase -
m
:
don't fork git chec
k
out
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
e
base
-
-apply: set O
R
IG_HE
A
D
correctly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Philli
p
W
o
od
r
e
base --a
p
pl
y
: fix reflo
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Ph
i
llip Wood
rese
t
_head():
t
ake
s
truct rebas
e
_head_opts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wo
o
d
rebase: c
l
eanu
p
r
e
set_
h
ea
d
(
)
c
a
lls
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
P
h
il
l
ip Wo
o
d
c
r
e
ate_autos
t
ash():
remove unneeded
p
arameter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
reset_head(): ma
k
e
d
efau
l
t_reflo
g
_
a
ction optional
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
r
eset_h
e
a
d
(): fact
o
r out ref updates
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phill
i
p Wood
re
s
et_head(): remove
act
i
o
n
parameter
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phill
i
p Wood
rebas
e
--apply: do
n
't run
po
s
t-checkout hook
if
there
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase:
d
o not remove untra
c
ked
f
i
les on ch
e
ckout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip W
o
od
rebase: pas
s
cor
r
ect argume
n
ts to pos
t
-
c
heckou
t
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 po
s
t-ch
e
ckout hook tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wo
o
d
rebase: f
a
ctor out checkou
t
for up to date branch
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phil
l
ip W
o
od
builtin add
-p: fix h
u
nk splitting
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wood
t37
0
1:
c
lean up h
u
nk splitting
t
ests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Ph
i
llip Wood
diff --colo
r
-moved: intern string
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff: use
d
esign
a
ted
initi
a
l
izers
for
e
m
i
tted_diff_
s
y
m
bol
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
Wood
diff --co
l
o
r
-m
o
v
e
d-ws=
a
llow-indentation-chang
e
: improve
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --
c
olor-moved: stop clearing potenti
a
l mo
v
ed
blocks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
hillip Woo
d
diff
--color-moved: shrink pot
e
nt
i
a
l move
d
blocks as
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phi
l
lip W
o
od
diff --color-
m
oved:
uni
f
y
moved block growth functions
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff -
-
color-moved:
c
all co
m
pa
r
i
s
on fu
n
ction
directly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
d
i
ff --color-moved-ws=allow-indent
a
tio
n
-c
h
an
g
e: simplify
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff
:
simplify
allow
-
indentation-change de
l
ta
c
alculation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
hillip Wo
o
d
diff --color
-
mov
e
d: avo
i
d false s
h
ort line matc
h
es
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
hillip Wo
o
d
diff
--color-moved=zeb
r
a
:
fix
alterna
t
e col
o
rin
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
W
ood
diff --col
o
r-mov
e
d: rewind when discarding pmb
commit
|
commitdiff
|
tree
2021-12-09
Phil
l
ip Wood
diff --color-moved:
f
actor out
f
un
c
tion
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip W
o
od
diff
-
-color
-
m
o
v
ed: clear all
f
lags
on blocks that
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Woo
d
diff --c
o
lor-moved:
a
d
d perf tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-01
Ph
i
ll
i
p W
o
od
xdiff:
i
mplement a
z
ealous diff3, or "zdi
f
f
3
"
Signed-off-by:
Phillip Wood
<phillip.wood123@gmail.com>
commit
|
commitdiff
|
tree
2021-11-19
P
hi
l
lip
Wood
xdiff: simplify comparison
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
Phillip Wood
xdiff: avoid unnecessar
y
memory allocations
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
Philli
p
Wood
diff
h
ist
o
gram: intern str
i
ngs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-03
Phillip Wood
rebase -i: fix rewording with --committer-date-
i
s-
a
uthor
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-18
P
hillip
W
ood
t1092: run "rebase --apply" wi
t
hout
"-q"
i
n testing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-07
Philli
p
Wood
sparse index: fix
use-
a
fter-free bu
g
in cache_t
r
e
e
_verify()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phillip W
o
od
rebase: fix todo-li
s
t
rereading
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phillip
Wood
sequencer
.
c:
factor out a
f
unction
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phillip W
o
od
r
eb
a
se: dereference tags
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Ph
i
l
l
ip
Wood
r
ebas
e
: use loo
k
u
p_
c
ommit_reference
_
by_name()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phi
l
lip Wood
reba
s
e: use
o
u
r
sta
n
dard e
r
ror re
t
urn valu
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407
:
r
ework reb
a
se --quit tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Philli
p
Wood
t3407: streng
t
hen
reba
s
e --abort te
s
ts
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phi
l
lip
Wood
t3407
:
use test_path_
i
s_missi
n
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phi
l
lip
Wood
t3407: ren
a
me a
v
ariable
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phi
l
lip Wood
t3
4
07: use tes
t
_cmp_rev
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phil
l
ip Wood
t3407: use test
_
commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phil
l
ip
Wood
t3407
:
r
un tests i
n
$TEST_DIRECTORY
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
P
hillip Wo
o
d
r
e
base -r: fi
x
merge -c with a merge strategy
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Philli
p
Wood
rebase -r
:
don't write
.
g
i
t/M
E
RG
E
_MSG
whe
n
f
ast-forwarding
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phill
i
p Wo
o
d
r
e
base -i: add a
n
other reword tes
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-20
Phill
i
p Wood
r
e
b
a
se
-r: make 'm
e
rge -c' be
h
ave like reword
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
P
h
illip Wood
rebase --con
t
in
u
e
:
remove
.
g
i
t/
M
ERGE_MSG
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Phillip Wood
rebase --appl
y
: restore some tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Ph
i
llip
Wood
t3403: fix
commit authorship
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phillip Wood
pat
i
ence
d
iff: remov
e
unu
s
ed
variable
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phillip Wood
pa
t
ience
d
iff: remove unnec
e
s
sary st
r
ing comparisons
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phill
i
p
W
ood
word diff: handle zero
l
ength
matche
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-29
Phill
i
p Wood
reba
s
e
-
i: c
o
mment out sq
u
ash!/fixup! subjects from
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next