repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pw/status-with-corrupt-sequencer-state'
2019-06-27
Phillip Wood
status: do not report errors in s
e
qu
e
ncer/
t
odo
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-27
P
hillip Wood
s
e
q
uencer: factor
o
ut todo command
n
a
me p
a
r
s
i
ng
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-27
Phillip Wo
o
d
seque
n
cer: always allow tab after
c
omm
a
nd name
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-18
Ph
i
ll
i
p
Wo
o
d
show --continue/skip etc
.
consistently i
n
synopsis
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-13
Phil
l
i
p
Wood
add -p: fix checkout -p with p
a
thological context
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-19
Phillip Wood
re
b
ase -r:
a
l
way
s
rew
o
rd merge -c
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phillip Wood
rebase --abort/--
q
uit: clean
u
p refs/rewritten
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phillip W
o
od
sequencer: r
e
turn error
s
fro
m
sequencer_remove_sta
t
e()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phillip
W
ood
rebase:
warn if state dire
c
tory can
n
ot be
removed
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phill
i
p Wood
rebase: fi
x
a memory
l
e
a
k
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
rebase -i: run
w
i
t
h
o
u
t
forking
rebase--interactive
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
P
h
illip Wood
rebase: us
e
a common acti
o
n enum
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip
Wood
rebase
-
i: us
e
st
r
uct r
e
base_op
t
ions in do_interactive
_
rebase()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Philli
p
Woo
d
rebase -i: use
st
r
uct reba
s
e_options
t
o
parse args
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip W
o
od
r
e
b
ase -i:
u
se struc
t
o
b
je
c
t
_id
f
or
squash_onto
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
re
b
a
s
e -
i
:
u
se struct com
m
it when parsing
o
ptions
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
rebase -i: remove duplic
a
tion
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip
Wood
rebase
-
i: co
m
bine rebase--
i
n
t
eracti
v
e
.
c with rebase
.
c
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Ph
i
llip
W
ood
rebase: us
e
O
PT_RERER
E
_AUTOUPDATE(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
rebase: rename write_basic
_
stat
e
()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phil
l
ip Wood
rebase
:
don't t
r
anslate trace strings
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
s
e
quencer:
always
discard index after
ch
e
ckout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
P
hillip Wood
s
equencer
.
c: s
a
ve and res
t
ore cleanup mode
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-18
Phil
l
ip Wood
seq
u
en
c
er
:
f
ix
cle
a
nup wi
t
h
--
s
i
gnoff and -x
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-17
P
h
illip Wood
fix che
r
ry-pick/r
e
ver
t
status a
f
te
r
commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-17
Philli
p
W
ood
commit/re
s
et: try to clean up sequencer state
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phillip Wood
cherry-pick --continue:
r
emem
b
er
options
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phi
l
lip Wood
cherry
-
pick:
demon
s
trate
option amne
s
ia
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phillip Wood
sequencer: break some
l
ong l
i
nes
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phillip Wood
merg
e
: twea
k
--rerere
-
autoupdate documenta
t
i
o
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phil
l
ip Wood
am
/
cherr
y
-
p
ick/rebase/rever
t
: d
o
cument --rerer
e
-autoupdate
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-29
Phi
l
lip Wood
rebase -x: sanity c
h
eck command
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-28
P
h
illip Wood
implicit int
e
ractive
r
ebase: don't run sequence editor
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
P
h
i
l
li
p
Wo
o
d
diff --color-mo
v
ed-ws:
han
d
le
b
lank lines
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
P
hillip Wood
d
iff --color-
m
o
ved-
w
s: mo
d
ify al
l
ow-ind
e
n
t
ation-cha
n
ge
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Philli
p
Wood
d
i
ff --color-mov
e
d
-
ws: optimize allow-
i
ndentation-c
h
ange
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip Wood
diff --color-moved=ze
b
ra:
b
e stricter
with c
o
l
o
r
alt
e
rn
a
tion
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip
Wood
d
i
f
f --color-mo
v
ed
-
ws: f
i
x
false positi
v
es
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Ph
i
llip Wood
diff --co
l
or-moved-ws:
d
e
monstrate false
p
ositive
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip Wood
dif
f
:
allow --no-color
-
m
oved-
w
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
P
hillip Wood
Use "w
h
itespace"
c
onsisten
t
ly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip Wood
diff:
d
ocumen
t
-
-
no
-
color-moved
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-11-01
Phillip Wood
sequencer: use read_aut
h
or_script()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-11-01
Phill
i
p Wood
add
r
ead_author_script() to
libgit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-11-01
Phi
l
li
p
Wood
am: rename read
_
aut
h
or_
s
c
ript()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-11-01
Phillip Wood
am: improve
author-sc
r
ip
t
error report
i
ng
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-11-01
Phillip Wood
am: don't die i
n
read_author_script()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-10-05
Phillip Wo
o
d
d
i
ff --color-moved:
f
ix a memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-10-05
Phillip Wood
diff
-
-color-m
o
ved-w
s
: fix another memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-10-05
P
h
illip Wood
diff --co
l
or-moved-ws: fix
a memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-10-05
Phillip Wo
o
d
diff --
c
olor-
m
o
v
ed-ws: fix out
o
f bou
n
d
s string
a
ccess
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-10-05
Phillip Wood
diff --color-moved-ws:
f
i
x double free c
r
as
h
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-09-11
Phillip Wood
di
f
f: fix --color-moved-ws=allow-indentation-change
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-08-16
Phi
l
lip
W
o
od
rebas
e
-i: fix SIGSEGV
w
hen 'merge <
b
ranch>
'
fai
l
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-08-16
Phillip Wood
t3430: add conflicti
n
g commi
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-08-15
Phillip
W
ood
rebase
-
i: fix n
u
mbering in squash message
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-08-07
P
h
illi
p
Wood
sequenc
e
r: fix quoti
n
g in write
_
author_script
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-08-07
Phil
l
ip Woo
d
sequen
c
er:
handle e
r
rors from read_author_iden
t
()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-06-19
Ph
i
llip Wood
seq
u
ence
r
: do
n
o
t squash
'reword' commit
s
w
hen w
e
hit
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-06-11
P
hilli
p
Wood
add -p: fix
counting empty context li
n
es in edited
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-04-26
Phil
l
ip Wood
rebase --reba
s
e-merge
s
: add test for --kee
p
-empt
y
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-29
P
hillip Wood
rebase
--kee
p
-empty: al
w
ays use
interactive rebase
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-29
Phillip Wood
rebas
e
-p: e
r
ror out
i
f
--signo
f
f is given
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-29
P
h
ill
i
p Wood
rebase:
e
xtend --signoff support
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-29
Phi
l
lip
W
ood
rebas
e
: res
p
ect --no-k
e
e
p
-empty
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-29
P
hillip Wo
o
d
rebase
-
i --keep-
e
mp
t
y: d
o
n't prune
e
mpty commits
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-20
Phillip Wood
rebase --
r
o
ot: sto
p
as
s
uming squa
s
h_onto is unset
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-05
Phillip W
o
od
add -p: don't rely on appl
y
's '-
-
recount' option
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-05
Philli
p
Wo
o
d
add -p: fix counting when
s
plitting and coalescing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-05
Phillip
Wood
add
-
p
:
calculate offset delta for edited patches
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-01
Philli
p
Wood
a
d
d -p: ad
j
ust o
f
f
s
e
ts of
s
ubseq
u
e
nt
hunks when o
n
e
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-01
Phillip Wood
t370
1
: add failing test for
p
ath
o
logi
c
al contex
t
lines
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-03-01
Phill
i
p Wood
t3701:
d
o
n't h
a
rd code sh
a
1 ha
s
h
valu
e
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-02-20
Ph
i
llip Wood
t3701: use test
_
write
_
l
i
nes
a
nd write_
s
cript
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-02-20
Phillip Wood
t37
0
1: indent
h
er
e
documents
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-02-20
Phillip Wood
add -
i
:
add functi
o
n to
f
ormat hunk header
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-02-13
P
h
il
l
ip Wood
add
-
p: i
m
p
r
ove error m
e
ssages
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-02-13
Phillip Woo
d
add
-p: only bind search key if there's mo
r
e th
a
n on
e
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-02-13
P
h
ill
i
p W
o
o
d
add
-
p
:
only display help for act
i
v
e keys
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-01-24
P
h
ill
i
p Wood
sequencer
:
run
'prep
a
re
-
commit-ms
g
' hook
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-01-24
P
h
illi
p
Wo
o
d
t7505: a
d
d tests for c
h
erry-pic
k
and rebase -i/-
p
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2018-01-24
P
hillip Wood
t75
0
5: st
y
le fix
e
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-12-13
Phillip Wood
sequen
c
er
:
i
mprove
config
h
and
l
in
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-24
Phil
l
ip Wood
t3512/t3
5
13: remov
e
KNO
W
N_FA
I
LURE_CHE
R
RY_PICK_SEES_EM
P
TY_
C
OM
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-24
Phillip Wood
sequencer: try
t
o commit without
forking
'
git commit'
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-24
Ph
i
llip Wo
o
d
sequencer: loa
d
c
omm
i
t related
c
o
nfig
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-24
Phill
i
p Wood
sequen
c
er: s
i
m
plify
a
ddi
n
g Signed-off-by: trailer
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-24
Phillip Wood
commit: move print
_
comm
i
t_summary() to l
i
b
g
it
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-18
Ph
i
llip Wood
commit
:
move post
-
rewrite code to lib
g
it
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-18
Phillip
Wood
Add a function to update HEAD aft
e
r creating
a
co
m
mit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-16
Phillip Wood
sequencer: resc
h
edule pick if index can
'
t be lock
e
d
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-16
Phill
i
p Wood
config: avoid
"wri
t
e_in_full(fd, buf, l
e
n)
!
=
le
n
"
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-10
Ph
i
l
lip
W
ood
commit: move empty message checks to
l
ibgit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-11-10
P
hillip Wood
t3404: c
h
eck
intermediate squash
messages
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-08-08
Phi
l
l
ip Wood
am: fi
x
s
i
gnoff when
o
t
h
er tra
i
lers are
pr
e
sent
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-08-02
Phillip Wood
cherry-pic
k
/revert:
rej
e
ct --rerere-a
u
to
u
pdate when
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-08-02
Phillip Wood
cherry-
p
ick/rever
t
: remember
-
-
r
erere-autou
p
date
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-08-02
Phillip W
o
o
d
t3504: use tes
t
_
com
m
it
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-08-02
P
h
illip Wood
reba
s
e
-
i
: h
o
no
r
--rerer
e
-
autoupd
a
t
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2017-08-02
P
h
illip Wood
rebase: honor --rerere-a
u
toup
d
ate
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next