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 'dk/zsh-git-repo-path-fix'
2022-01-26
P
hillip Wo
o
d
rebase: do not remove un
t
racked files on check
o
ut
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase:
pass correct argu
m
ents
to post-checkout
h
o
ok
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
t54
0
3: refac
t
o
r
rebas
e
po
s
t-checkou
t
hook tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-26
Phillip Wood
rebase: facto
r
out che
c
kout
fo
r
up t
o
date b
r
anch
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wo
o
d
buil
t
i
n a
d
d
-
p: fix hunk splitting
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2022-01-12
Phillip Wood
t3701:
clean up hunk splitting tes
t
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip
Wood
d
i
ff --color-mo
v
ed:
i
ntern s
t
ri
n
gs
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff: use
des
i
gnate
d
initi
a
lizers for emi
t
ted_diff
_
symbol
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --c
o
lor-move
d
-ws=allow-inde
n
tati
o
n-change: imp
r
ove
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff
--color-moved: stop
c
learing pot
e
ntial moved blo
c
ks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --color
-
moved: shrink po
t
ent
i
al moved blocks as
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wo
o
d
diff --colo
r
-move
d
:
un
i
f
y
moved block growth
f
unctions
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Philli
p
Wood
di
f
f --c
o
lor-move
d
: call comparis
o
n
function directly
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --color
-
moved-ws=allow-indentation-change
:
simpl
i
fy
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wo
o
d
di
f
f: simplify
a
llow-in
d
e
ntation-chan
g
e delt
a
calculat
i
on
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phillip Wood
diff --color-moved: avoid fal
s
e short line matches
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phi
l
lip Wood
diff -
-
col
o
r
-
moved=
z
e
bra
:
fix alternate coloring
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
P
hillip Wood
diff --color
-
moved: rew
i
nd when discard
i
ng pmb
commit
|
commitdiff
|
tree
2021-12-09
Phi
l
lip Wood
d
iff --color-
m
ov
e
d: fac
t
or
o
u
t
func
t
ion
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-09
Phil
l
ip Wood
diff --co
l
o
r-mo
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
Wood
diff --c
o
l
o
r-moved: add perf tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-12-01
Phillip
W
ood
xdiff: i
m
plement a zealous diff3
,
or "
z
diff3"
Signed-off-by:
Phillip Wood
<phillip.wood123@gmail.com>
commit
|
commitdiff
|
tree
2021-11-19
Ph
i
l
l
ip Wood
xd
i
ff: simplify com
p
aris
o
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
Phi
l
lip
Woo
d
xdiff:
a
vo
i
d unnece
s
s
a
ry memory al
l
o
c
ations
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-19
Phil
l
ip Wood
d
i
f
f histogram: intern strings
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-11-03
Phillip Wood
rebase -i: fix
rewording wi
t
h --
c
ommit
t
er
-
da
t
e-is-
a
uthor
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-18
P
h
i
l
lip W
o
od
t
1
092: run
"
reb
a
s
e
--apply" without "-q" in te
s
t
ing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-10-07
P
h
illip Wood
sparse index: f
i
x use-after-free
bug in c
a
che_tree_verify()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
P
hil
l
ip W
o
od
r
e
base: fix todo-list
rereadin
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-24
Phillip W
o
od
se
q
uencer
.
c
:
fact
o
r out a
function
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Phillip Wo
o
d
r
e
base: dereference
tags
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
Philli
p
Wood
rebase:
u
se
l
o
o
k
up_commit_
r
eference_by_name()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-22
P
hillip Woo
d
re
b
ase: use our
s
tandar
d
error return v
a
lue
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip W
o
od
t3407: rework rebase --quit tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407: str
e
ngthen rebase -
-
a
bort
tests
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Ph
i
llip
Woo
d
t340
7
: use test_path_i
s
_m
i
ssi
n
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407: rename a va
r
iab
l
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
Phillip Wood
t3407: use test_
c
mp_rev
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
P
hi
l
lip Wood
t3407: use test_commit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-09-13
P
hillip Wood
t
3
407: run tests in $TEST_D
I
R
E
CTORY
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
P
h
i
l
lip
Wood
rebase -r: fix mer
g
e -
c
with a merge strateg
y
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phillip Wood
r
e
base -r:
d
o
n
'
t
write
.
git
/
M
ERGE_M
S
G when
f
a
st-forward
i
ng
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-23
Phillip Wood
rebase -
i
:
a
d
d another re
w
o
rd test
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-20
Phill
i
p Wood
rebase -r: make 'merge -c' behave like reword
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Phillip Wood
re
b
as
e
--continue: re
m
ove
.
git/MER
G
E
_
MSG
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Phillip Wood
rebase --a
p
ply: restor
e
som
e
tes
t
s
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-08-13
Phill
i
p Wood
t3403: fix com
m
it authorsh
i
p
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phillip
Wood
patience diff:
r
e
move
unu
s
ed
var
i
able
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
Phillip Wood
pat
i
ence diff: remove unnecessa
r
y
s
t
ring comparis
o
ns
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-05-05
P
h
i
ll
i
p Wood
word
d
iff: handle z
e
ro length ma
t
c
h
es
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-29
P
hillip Wood
rebase -i: comme
n
t ou
t
sq
u
ash!
/
f
i
x
up! subjects
from
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-21
Phillip Wo
o
d
s
e
q
ue
n
cer: fa
c
tor o
u
t code to
append squash messag
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2021-01-21
Phillip Wo
o
d
r
eb
a
se -i: on
l
y w
r
ite
f
i
xup-
m
essa
g
e when it's needed
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phi
l
lip Woo
d
rebase -i:
sim
p
lify get_re
v
ision_ranges()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
P
h
illi
p
Wood
rebase -i:
u
s
e struct
object_id when
writing
s
tate
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phillip
Wood
rebas
e
-i:
u
se struct object_id rather than looking
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-11-04
Phillip Wood
r
e
b
ase -i: stop
overwrit
i
ng ORIG_HEAD b
u
ffer
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-09-09
Ph
i
llip Wood
add -p: fi
x
editin
g
of intent-to-a
d
d paths
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-09-08
Phillip Wo
o
d
add -p: f
i
x memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-19
Phillip
W
ood
rebase -i: su
p
port --ignore-d
a
t
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-17
Phi
l
l
i
p W
o
od
r
e
base -i: support --
c
ommitter
-
date-is-author-date
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-17
Phillip Wood
am: stop exporti
n
g GIT_COMMITTER_DATE
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-17
Phillip Wood
add -
p
: f
i
x checking o
f
user in
p
u
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2020-08-17
Phillip Wood
a
d
d -p: use ALLOC_GROW_BY instead of ALLOW_GROW
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
Phillip Wood
c
om
m
it: give correct
a
dvice for emp
t
y commit during
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
P
hillip
W
ood
commit:
e
n
c
apsulate determin
e
_whence(
)
for s
e
q
u
encer
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
P
h
illip Wood
commit
:
use enum v
a
lu
e
for
m
u
ltiple cherr
y
-picks
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
Phillip Woo
d
seque
n
cer:
write CHERR
Y
_PICK_H
E
AD for reword and edit
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
Phillip Wood
ch
e
rry-pick: check commit e
r
r
o
r
me
s
sages
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-12-06
P
h
illip
Wood
t3404:
u
s
e test_cmp_rev
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-11-23
P
h
illip
W
ood
se
q
ue
n
cer:
f
i
x empty commit ch
e
ck when
a
mending
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Phillip Wood
seque
n
c
e
r: ru
n
post-commit hoo
k
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Ph
i
llip Wood
m
o
v
e run_
c
ommit_hook() to l
i
bgit and use it the
r
e
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Ph
i
llip
Wood
sequenc
e
r
.
h fi
x
placeme
n
t of #endif
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Phillip Wood
t3404: remove uneede
d
calls to set
_
fa
k
e_ed
i
tor
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Phillip Wo
o
d
t3
4
04:
set $EDITOR
i
n
s
ubshell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-10-16
Phillip Wood
t
3404: remove u
n
necessa
r
y subshell
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-08-19
Phillip
Wood
se
q
uence
r
: si
m
pli
f
y root
c
omm
i
t
c
rea
t
io
n
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-08-19
Phillip Wood
rebase -i: check
f
or upda
t
ed todo
aft
e
r
s
quash and
.
.
.
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-08-19
Phil
l
ip Wood
r
ebase -i:
always update HE
A
D before
r
ewordin
g
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-07-08
Phillip Wo
o
d
t
3
420
:
remov
e
progress lines before comparin
g
outpu
t
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-07-01
Phillip Wo
o
d
g
i
t
-
pro
m
pt
:
improve cherry-pick/reve
r
t detection
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-27
Phillip Wood
stat
u
s: do
not report errors in sequencer/
t
od
o
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-27
P
hil
l
ip Woo
d
s
equencer: factor out to
d
o
command name parsing
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-27
Phill
i
p Wood
sequencer: always a
l
low
tab after command
n
a
me
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-18
Phillip Wood
sho
w
--continu
e
/s
k
ip etc
.
con
s
istently
i
n
s
y
n
op
s
is
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-06-13
Phillip W
o
od
add -p:
f
i
x
c
h
e
c
kout -p
w
it
h
pathol
o
gical
c
o
n
text
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-19
Phillip Wood
rebase -r: always rew
o
rd merge -c
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
P
hill
i
p Wood
reba
s
e --abort/--quit
:
cleanup re
f
s/rewritten
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Philli
p
Wo
o
d
sequencer:
return
errors from s
e
q
u
e
ncer_remove_state()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phi
l
l
i
p Wood
rebase:
wa
r
n if state di
r
ectory cannot be removed
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-05-15
Phill
i
p Wood
rebase: f
i
x a
memory leak
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wo
o
d
rebase -i: run withou
t
fork
i
ng rebase
-
-interactive
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Ph
i
llip Wood
r
e
bas
e
: use a
common
a
ction enum
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phil
l
ip
W
ood
reba
s
e -i: us
e
struc
t
rebase_opti
o
ns in do_i
n
tera
c
tive_re
b
ase()
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phil
l
ip Wo
o
d
reba
s
e -i: use str
u
ct rebase_options t
o
p
a
rse args
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip W
o
od
reb
a
se -i: use struct
object_id for squash_onto
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Philli
p
Woo
d
reba
s
e -i: use struct commit
when parsing opt
i
o
ns
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip Wood
r
ebase -i: rem
o
ve duplication
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
2019-04-19
Phillip
Wood
rebase -i: combine rebase--in
t
eractive
.
c
w
i
th rebase
.
c
Signed-off-by:
Phillip Wood
<phillip.wood@dunelm.org.uk>
commit
|
commitdiff
|
tree
next