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
t3701: clean up hunk splitting tests
2022-01-12
Phillip Wood
t3701: clean up hunk splitting tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-03
Phillip
Wood
r
ebase -i: fi
x
rewordin
g
with
-
-
co
m
mitter-date-is
-
author
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-18
Ph
i
llip Wood
t1092: run "reba
s
e --apply" without "
-
q"
i
n testing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-07
P
h
illip Wood
spa
r
s
e
index: fix
u
se-after-free
b
ug i
n
c
ache_tree_verify()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phillip Wood
rebase:
f
ix todo
-
list r
e
reading
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phillip W
o
od
sequencer
.
c: factor ou
t
a
f
unctio
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phillip Wood
r
eba
s
e: dereference
tags
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phil
l
ip W
o
od
rebase: use
lookup_commit_reference_by_name(
)
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phillip Wood
rebase: use our standard error return value
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t
3
4
07: rework
r
ebase --quit t
e
st
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407: stre
n
gthen rebase --ab
o
rt tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
P
h
illip Wood
t3
4
07: use test_path_i
s
_m
i
ssing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip
W
ood
t3407: rename a
v
aria
b
le
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t340
7
:
u
se test
_
cm
p
_
rev
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
P
h
il
l
ip
W
ood
t3
4
07:
use test_commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407: run tests in $TEST_DIRECT
O
RY
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phi
l
lip W
o
od
rebase
-
r: fix merge
-c
w
i
t
h a merge strategy
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
P
h
i
llip Wood
rebas
e
-r: don't write
.
git/MERGE_
M
SG
w
hen fas
t
-forwarding
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Ph
i
ll
i
p W
o
od
rebase -
i
:
add an
o
th
e
r r
e
word test
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-20
Phillip Wood
rebase
-r: make 'merge -c' behave l
i
ke reword
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Philli
p
Wo
o
d
r
ebase --
c
ontin
u
e: remove
.
g
it/MER
G
E_MSG
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
P
hi
l
lip Wood
r
ebase --apply: res
t
ore some tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Phi
l
lip W
o
od
t
3
4
03: fix commit a
u
t
horsh
i
p
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
P
hillip Wood
p
a
ti
e
nce
diff: remove u
n
us
e
d variable
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phillip Wood
p
atience diff: remove unne
c
essary str
i
ng c
o
mparisons
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phillip Wood
wor
d
diff: handle zero le
n
gt
h
matches
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-29
Phillip Wood
reba
s
e
-i: comment out
s
quash
!
/fixup
!
subjects from
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-21
Phillip Wood
se
q
uen
c
er: factor
o
ut code to append
s
quash message
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-21
Phi
l
li
p
Wood
reb
a
se
-
i: only write fixup-message w
h
en it's needed
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phillip Wood
reb
a
se
-i: s
i
mplify
get_rev
i
sion_ranges()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phill
i
p Wood
rebase -i: use struct object_id w
h
en wri
t
ing
state
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
P
hilli
p
W
o
od
rebase -i
:
us
e
struct ob
j
e
c
t_id
rather th
a
n lookin
g
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phillip
W
ood
rebase -i:
stop overwriting ORIG_HEA
D
buffe
r
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-09-09
Ph
i
llip Wood
ad
d
-p:
fix editing of intent-to-add paths
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-09-08
Phillip Wood
add -p: fix
memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-19
Ph
i
l
li
p
Wood
rebase -i: support --ig
n
o
re-
d
ate
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-17
Ph
i
l
l
ip Wood
r
e
base -i:
s
upport --commit
t
e
r-da
t
e-is-author-date
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-17
Phillip Wo
o
d
am:
s
t
op
e
xporting
GIT_
C
OMMITTER_DA
T
E
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-17
Phil
l
i
p
W
ood
add -p: fix checking of user input
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-17
P
h
i
llip Wood
add -p: use ALLOC_GRO
W
_BY in
s
tead of
A
L
L
O
W
_GROW
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
Phillip W
o
od
commi
t
: give
c
o
r
rect
advic
e
for empty commit during
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
Phillip W
o
od
commit: encaps
u
l
a
te dete
r
mine_when
c
e() f
o
r sequencer
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
Phillip Wood
commit: use enum
v
a
l
ue for mu
l
tiple
cherry-pick
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
P
h
il
l
ip Wood
sequen
c
er:
w
rite CHER
R
Y_PICK_HEA
D
for reword a
n
d
edit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
P
h
i
llip
W
ood
cherry-p
i
ck: check commit error messa
g
es
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
Phi
l
lip Woo
d
t
3
404
:
u
s
e test_cmp_re
v
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-11-23
Phillip Wood
se
q
uen
c
er: fix
e
mpty co
m
mi
t
che
c
k
when amending
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Ph
i
llip Wood
se
q
uencer: run post-commit hook
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Phil
l
i
p
Wood
move run_commit
_
hook() to libgi
t
a
n
d
use
i
t
there
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Phillip Wood
sequencer
.
h fix placement of #endif
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
P
h
illip W
o
od
t3404: remove uneeded cal
l
s
t
o set
_
fake_editor
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
P
hillip Wo
o
d
t3404: set
$
E
DITOR
i
n subshell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Phill
i
p
Wood
t3404:
remo
v
e unnecessary s
u
bshell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-08-19
Phillip Wood
sequencer:
s
impl
i
fy root
c
o
m
m
i
t
c
reation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-08-19
Phillip Wood
r
eba
s
e
-i: c
h
e
ck for updated tod
o
after squash an
d
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-08-19
Philli
p
Wo
o
d
rebase -i: alway
s
upd
a
te HEAD bef
o
re rewo
r
ding
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-07-08
Phillip Woo
d
t3420: remove pr
o
gress lines b
e
fore comparing
output
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-07-01
Phillip Wood
git-pr
o
mpt: impro
v
e
cherry-pick/r
e
vert detectio
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-27
Phillip Wood
s
t
atus: do not report error
s
in
sequencer/todo
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-27
Phillip Wood
sequence
r
: fa
c
tor out
t
odo command
name par
s
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-27
P
h
i
l
l
ip
Wood
sequen
c
er
:
always al
l
ow tab after command
n
am
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-18
Ph
i
llip
W
o
od
sho
w
--con
t
in
u
e/s
k
ip etc
.
consi
s
tently in synopsis
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-13
Phillip
W
ood
add -p: fi
x
checkout -p w
i
th p
a
thologic
a
l context
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-19
Phillip Wood
re
b
ase -r: always r
e
word m
e
rge -c
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phillip Wood
rebase --abo
r
t/--qu
i
t:
clean
u
p refs/rewritten
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phillip Wood
seque
n
cer: r
e
turn errors fro
m
s
eq
u
enc
e
r_re
m
o
ve_state()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phillip Wood
reb
a
s
e: warn if state direct
o
ry
c
a
nnot
be re
m
oved
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Ph
i
llip Wood
rebase: fix
a
memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip W
o
od
reba
s
e
-
i
: run
w
ithou
t
fork
i
n
g r
e
bas
e
--interactive
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wo
o
d
rebase
:
use
a
common action enum
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
P
hillip Wood
r
e
ba
s
e -i:
use struct r
e
base_options in do_interactive_rebase()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
rebase -i: us
e
s
t
ru
c
t rebase_options to
parse
a
r
gs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Woo
d
reb
a
se -i: use struct
object
_
id for squa
s
h_onto
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phill
i
p Wood
rebase -i: use struc
t
c
o
mmit w
h
e
n pa
r
sing o
p
tions
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Ph
i
llip Wo
o
d
reba
s
e -i: remove duplication
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
P
hillip W
o
od
r
e
b
ase -i
:
combine rebase--interactive
.
c with re
b
ase
.
c
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
P
h
i
llip Wo
o
d
rebase:
use OPT_RE
R
ERE_AUTO
U
PD
A
TE()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
rebase:
rename write_
b
a
sic_state()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
rebase: don't t
r
anslate
t
race strings
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Woo
d
sequence
r
: always di
s
c
a
rd
index after checkout
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phill
i
p Wood
sequencer
.
c:
s
a
v
e and r
e
sto
r
e cleanup m
o
de
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-18
Ph
i
llip
W
ood
sequence
r
: fix cleanup with --sig
n
off and -x
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-17
Phil
l
ip Wood
fix c
h
erry-pick
/
reve
r
t status after commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-17
Phillip
W
ood
c
o
mmi
t
/reset: try
t
o cl
e
an
up
s
equencer
s
t
ate
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phillip W
o
od
cherry-pick --continue: re
m
ember options
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phi
l
lip
Woo
d
cherry-pick: demonstrate option amnesia
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phil
l
i
p
Wood
se
q
uencer: break
so
m
e long lin
e
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phillip Wood
me
r
ge: tweak --rerere
-
autoupdat
e
docum
e
ntation
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-03-18
Phillip Wo
o
d
am/cherry-p
i
c
k
/
r
e
b
ase
/
rev
e
rt: docum
e
nt -
-
r
e
rere
-
au
t
oupd
a
te
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-29
Phil
l
ip Wood
rebas
e
-
x: sanity
c
h
eck comman
d
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-28
Ph
i
llip W
o
od
imp
l
i
c
it interactive reb
a
se: don't run sequ
e
nce editor
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip
Wood
dif
f
--co
l
or-
m
oved-ws
:
han
d
le blank li
n
es
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip
W
ood
diff --color-moved
-
ws: modify all
o
w-indentation-ch
a
nge
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip W
o
od
diff --color-move
d
-ws:
o
p
timize allow-indentatio
n
-ch
a
n
g
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phil
l
ip Wood
d
iff
--color-m
o
v
e
d=zebra:
b
e stricter with colo
r
alter
n
ati
o
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
P
h
illip Wood
d
i
ff --c
o
lor-moved-ws: fi
x
f
a
l
se positives
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
P
hillip Wood
di
f
f --color-moved-ws: d
e
m
o
n
strate false
po
s
iti
v
es
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
P
h
illip Wood
diff:
allow --no-color-moved-ws
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip Wood
U
se
"whitespace" consist
e
ntl
y
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-01-10
Phillip W
o
od
diff: document --no-
c
olor-mo
v
ed
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next