repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sha1_name: fix error message for @{<N>}, @{<date>}
2013-05-17
John Kee
p
ing
d
i
f
ftoo
l
: fi
x
dir-diff w
h
en fi
l
e does not exist
i
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merg
e
-tree:
h
andle
d
i
rectory/e
m
p
t
y conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
o
hn K
e
eping
t/Makefile: remove smoke test targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
me
r
ge-tr
e
e
:
fix ty
p
o in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Keeping
t
r
anspor
t
-
helper: add
'
s
i
gned-tag
s
' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Ke
e
ping
tr
a
nsport-hel
p
e
r
: p
a
ss --s
i
gned-ta
g
s
=
warn
-
strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn Kee
p
i
n
g
f
ast-ex
p
ort: add --signed
-
tags=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
t/te
s
t
-lib
.
sh
:
fix TRASH_DIRECTOR
Y
handl
i
ng
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree: don't print entries that
m
atch
"
l
o
cal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
Ke
e
ping
gitrem
o
te-helpe
r
s(1)
:
clarify
ref
s
p
ec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Ke
e
ping
submodule: print graph output next t
o
submo
d
u
l
e log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Keeping
d
i
ff: al
l
ow unst
u
ck arguments wit
h
--
d
iff-a
l
gorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t
-
merge(1): docum
e
n
t
d
i
ff-a
l
gorithm option to
m
e
rge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
ng
b
isect: avoid signed integer ov
e
r
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keep
i
n
g
diffcore-bre
a
k: d
o
n't divide by z
e
ro
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t
7
8
00: run --dir-diff
tests with
a
nd without symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: fix tests when diffto
o
l use
s
--no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Kee
p
i
n
g
t7800: don
'
t
hid
e
grep
o
utput
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
i
n
g
difftool: don'
t
o
v
erwr
i
t
e mod
i
fied fil
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800:
move
'
--sym
l
i
n
ks' sp
e
cific tes
t
to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
Keeping
m
e
rge-tree: fix t
y
po in merge-tree
.
c::unre
s
olved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix fre
a
d er
r
or handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entr
y
:
fix fil
t
er look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t
2
003: moder
n
ize
style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
i
ng
difftool --dir-diff
:
symlink
a
ll files matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
dif
f
tool: avoid doub
l
e slashes in s
y
mlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keepin
g
g
it-difftool(1): fix formatti
n
g of --syml
i
nk d
e
scription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "
g
raph
.
c:
m
ark private fi
l
e-scop
e
symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile:
mak
e
mandir
,
htmldir and inf
o
d
i
r absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keep
i
ng
reb
a
se -i: re
s
p
ect
c
o
re
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Kee
p
ing
combine-diff
.
c: teach combi
n
ed
d
i
ffs abo
u
t line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: use diff_line_pr
e
fix
(
) wher
e
ap
p
licable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepi
n
g
diff: add
d
i
ff
_
l
i
n
e_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff
.
c
:
make constant string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff:
w
rite prefix t
o
the correct fi
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: outpu
t
padding for
m
e
r
ge subsequ
e
nt parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepi
n
g
t403
8
: add tests for "di
f
f --cc --raw <t
r
ees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keepi
n
g
bu
i
l
tin/apply: tighten (dis)sim
i
larity index p
a
rsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
mergetool--li
b
: l
i
st us
e
r con
f
igured tools in '--to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keepi
n
g
R
e
name {git- => git}r
e
m
ote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
C
o
din
g
Gu
i
delines: ad
d
P
ython c
o
di
n
g guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
gi
t
-remot
e
-t
e
stpy: fix path
h
a
shing on Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
K
eepin
g
mergetool--lib:
d
on't call "e
x
it
"
in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-difftoo
l
: use
g
it-m
e
rge
t
ool-
-
lib for "--tool-h
e
lp
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-m
e
r
getool:
don't ha
r
dcode 'mergeto
o
l' in s
h
o
w_to
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
git-mergetool: remove redundant
a
ssi
g
nment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git-mergeto
o
l: mov
e
show_tool_help to mergeto
o
l--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-remote-tes
t
py: call print as a f
u
n
c
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
g
i
t-rem
o
te-testpy:
d
on't do unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
g
it-r
e
mote-testpy: hash by
t
es explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
svn-
f
e: allow
s
vnrdump_sim
.
py to run w
i
th Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git_remo
t
e
_
helpers: use 2
t
o
3
if bu
i
ldi
n
g
w
ith Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
pi
n
g
g
i
t_remote_helpe
r
s
:
force rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John
Kee
p
ing
git-cvsimport
.
txt: cvsps-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keep
i
ng
git-for-each-ref
.
txt: 'r
a
w
'
is
a
supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Kee
p
ing
g
i
t
_
remote_
h
elpers: fix input when running under
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
g
i
t_rem
o
te_helpers: al
l
ow bu
i
l
d
i
ng with Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
o
hn Keeping
git-svn: teach fin
d
-re
v
to find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Keeping
git-f
a
st-import(1):
r
eorgani
s
e
option
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fa
s
t-import(1): combine documentat
i
on of
--[
n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
h
n
Keeping
git-shortlog(1): document behaviour
of ze
r
o-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Jo
h
n Keeping
git
-
fas
t
-import(1): remove duplicate
'--done' o
p
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Do
c
umentation: do
n
't
l
ink to
example mail addre
s
ses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John
K
e
epi
n
g
reb
a
s
e -i continu
e
: don't ski
p
commits tha
t
only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree