repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: fix section header mark-up
2015-09-25
John Keeping
Documentation: fix section header
m
ark-up
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-05-27
John
K
eeping
com
p
l
e
t
i
o
n: add
missing
options for git-merge
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n
Keeping
c
o
m
p
le
t
i
o
n
:
add a note that
merge opt
i
ons ar
e
shared
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-03-11
John
K
eeping
builtin/mv: fi
x
out
of bounds wri
t
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
b
u
iltin/mv: don't use memory a
f
ter free
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
John Keeping
utf8: use correct type
f
o
r
v
alues
i
n
i
nterval
table
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
J
ohn Keeping
utf8: fi
x
ic
o
nv error detection
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-02-18
Joh
n
Keep
i
n
g
notes-utils: handle boolean
n
ot
e
s
.
r
e
w
rit
e
m
o
d
e correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-27
John Keeping
Makefil
e
: remove redunda
n
t object in git-
h
ttp{fetch
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-17
Jo
h
n Keeping
pull: suppress error w
h
en no
r
e
motere
f
is found
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John Kee
p
ing
completio
n
:
h
a
ndle --[no-]fork-point o
p
tions to git
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-13
John
K
eeping
completio
n
:
complete
m
erge-base
options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2014-01-09
John Keeping
rebase: fix fork-point wit
h
z
er
o
arg
u
me
n
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-10
John Keep
i
n
g
reba
s
e:
use r
e
flog to find common base wit
h
u
p
s
t
ream
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-12-09
John K
e
epi
n
g
pull: use merge-b
a
se
-
-
f
ork-point
when appropri
a
te
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
J
o
hn
Ke
e
ping
peek
-
r
e
m
ote: r
e
move deprecated alias
o
f ls-remote
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John Keeping
l
ost-found
:
re
m
ove depre
c
ated com
m
and
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
J
oh
n
Keeping
tar-tree:
r
emove deprec
a
ted command
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-11-12
John
Keepin
g
repo
-
c
o
nfi
g
: remove deprecated al
i
as fo
r
"
g
it config
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-10-03
John Kee
p
ing
Documentat
i
on/Makefile:
m
a
k
e Asci
i
Doc
d
b
la
t
e
x di
r
con
f
igurable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-26
Jo
h
n K
e
eping
m
er
g
e-recursive: f
i
x parsing of
"diff-algori
t
hm
"
option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
Jo
h
n Keeping
r
e
s
e
t: handle
s
ubmodul
e
with trailing sl
a
sh
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-13
John Keeping
rm: re-use parse_pathspec's trail
i
ng-
s
lash removal
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-09-09
John Kee
p
ing
g
i
t
_
remote_helpers: remo
v
e litt
l
e us
e
d Pyt
h
on
libra
r
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
J
o
hn Keepi
n
g
rev-parse(1): l
o
gically
g
r
oup options
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-22
John Keepi
n
g
rev-par
s
e: r
e
move
r
est
r
ictio
n
s on
s
ome opt
i
ons
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-08
Joh
n
Ke
e
ping
p
u
l
l
: ch
a
nge the d
e
scri
p
tion to
"
i
n
tegrate" chang
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
John Keepi
n
g
push: avo
i
d
s
uggesting
"merg
i
ng" remote
c
hanges
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-07
J
o
hn Keeping
git-config(1): clari
f
y precedence of multiple va
l
ues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-07-03
John
Keeping
git-con
f
ig:
upd
a
te d
o
c for --get with
m
ultiple va
l
u
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
Jo
h
n Keep
i
ng
comple
t
ion
:
learn abo
u
t -
-
ma
n
-pat
h
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-30
John Kee
p
ing
c
ompletion: h
a
n
dle unstuck for
m
of base gi
t
op
t
ions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Keeping
fast-import
:
allow
m
oving th
e
r
oo
t
tree
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
Joh
n
Ke
e
ping
fast-impo
r
t:
allow ls
o
r f
i
lecopy of the root tr
e
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
fast-import: se
t
valid mo
d
e on r
o
ot
tree in "ls"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-23
John Keeping
t93
0
0: docum
e
nt fast-im
p
o
r
t empty pa
t
h issues
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
submodule: drop the top-le
v
el requirement
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
e
epi
n
g
rev-pa
r
se: add
-
-
prefix
o
ption
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
K
eep
i
ng
submodule: s
h
o
w
full path in e
r
ror mess
a
ge
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
t7403:
add missing &
&
c
haini
n
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John
Keepi
n
g
t7403: m
o
derniz
e
style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John K
e
eping
t74
0
1
: make indentati
o
n consis
t
ent
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
John Keeping
mer
g
etool--lib:
r
efactor {diff,m
e
rge}_
c
md
l
og
i
c
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
Jo
h
n Keep
i
ng
Documentation/Makefile:
mo
v
e infodir to
b
e
wi
t
h
o
t
h
er
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-17
J
o
hn
K
e
e
p
ing
Documenta
t
ion/Makefile
:
f
i
x spaces aroun
d
ass
i
gnments
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-12
John Keep
i
ng
a
dd--intera
c
t
ive: respect diff
.
algorith
m
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-06-07
J
o
hn Keeping
git-gui: fi
x
file
n
ame handling
w
ith non
-
empty prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-28
J
ohn Keeping
fetch: don't tr
y
to upda
t
e unfetched tracking
r
efs
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
John Keep
i
ng
difftool: fix d
i
r-diff when fil
e
does
not exist in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
Jo
h
n
Kee
p
ing
merge-tr
e
e
:
handle directory/emp
t
y conflict correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-06
John Keeping
t/Mak
e
file: don't de
f
ine
T
ES
T
_RESUL
T
S
_DIREC
T
ORY recursiv
e
ly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-01
John Keeping
contrib/subtree
:
don't delete remote b
r
anches
i
f split
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-29
J
o
hn Kee
p
ing
test
o
u
t
put: res
p
e
ct $TEST_OU
T
PUT_DIRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn Keeping
t/Makef
i
le: remove smoke test t
a
rget
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John
K
e
eping
merge-tree: fix typo in "both c
h
anged ide
n
tica
l
l
y
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-27
John Keeping
t/Makefile: f
i
x result
ha
n
dling
with TE
S
T_OUTPUT_
D
IRECTORY
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
o
h
n Keeping
t
ransport-h
e
lper: a
d
d 'signed-t
a
gs' capability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
K
ee
p
i
n
g
transport-hel
p
er
:
pa
s
s --sig
n
ed-tag
s
=warn-s
t
rip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Keeping
fast-export: add --s
i
gned-tags=war
n
-st
r
i
p mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
t
/test-lib
.
sh: fix
T
R
A
SH
_
DIRE
C
TORY handl
i
n
g
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
Joh
n
K
e
eping
merge-tree:
d
on't print entries tha
t
match "local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitremote-helper
s
(1): clari
f
y r
e
fsp
e
c
b
ehavi
o
ur
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
Keepi
n
g
submodule:
p
rint graph
o
u
t
put
n
ext to sub
m
odule log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
diff:
allow unstuck argum
e
nts w
i
th --diff-algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge
(
1
): docum
e
nt
diff-algo
r
ithm option to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
b
i
sect: avoid signed in
t
eger o
v
erflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John
Keeping
di
f
fcore-break: don
'
t
d
ivide by zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn
K
eeping
t780
0
: run
--dir-diff
t
est
s
w
ith a
n
d
w
it
h
out
symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
t78
0
0: fix
tests when difftool use
s
--no-
s
ymlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t780
0
: don
'
t hide
g
rep output
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftool: don't overwrite modifie
d
f
i
les
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
Keeping
t7
8
00: m
o
ve '--symlinks' specific te
s
t
t
o the e
n
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Keeping
merge-
t
ree: fix t
y
p
o
in me
r
ge-t
r
ee
.
c::unres
o
lved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Keep
i
ng
re
f
s
.
c: fix
fread error handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
Kee
p
ing
entry: fix
filter loo
k
up
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: moderniz
e
style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
difftool --dir
-
d
iff: symli
n
k all fi
l
es matc
h
ing the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keep
i
ng
difftool:
avoid double slashes in symlink targ
e
ts
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
git-difftool(1):
f
ix formatt
i
ng of --symlink
d
e
scripti
o
n
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Re
v
e
r
t
"
graph
.
c:
m
a
r
k priv
a
te f
i
le-scope symbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
John
Keeping
M
a
kefile:
m
ake man
d
ir, ht
m
l
d
ir and infod
i
r absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
rebase -i: respect
core
.
commentcha
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
n
g
comb
i
n
e
-diff
.
c: teach combined
d
iffs
about
l
ine
prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use diff_line_prefix() where appli
c
abl
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
ep
i
ng
diff
:
add
d
iff_li
n
e_
p
refix
f
unction
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff
.
c:
m
ake constant str
i
ng arguments const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
e
eping
d
i
ff: write
p
refi
x
to the c
o
rrect file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph
:
outpu
t
padding
f
or merg
e
subseq
u
ent p
a
rent
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Keeping
t4038: ad
d
tes
t
s for "diff --cc --raw <tre
e
s>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/a
p
ply:
tighten
(dis)s
i
m
i
l
ari
t
y in
d
ex
p
arsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--lib:
lis
t
user configured tools in '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn K
e
e
p
i
n
g
Rename {g
i
t- => git}remot
e
-
help
e
rs
.
t
x
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codi
n
gGuidelines: add Python
coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-testpy:
f
i
x
p
ath hashi
n
g o
n
Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Keepi
n
g
me
r
getool--lib
:
don't call "exit" in
s
etup_tool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-difftool:
use git-m
e
rgetool--li
b
for "--tool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool
:
d
o
n
'
t har
d
code
'
m
e
rgetool' i
n
s
how_tool_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
g
it-mergetool
:
r
e
move redundan
t
a
s
sig
n
ment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n
K
eepi
n
g
git-mergetool:
m
ove show_tool_he
l
p
t
o
m
ergetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-re
m
ote-
t
estpy:
call pr
i
nt as a function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
next