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
contrib: drop blameview/ directory
2013-05-17
John Ke
e
ping
diffto
o
l: fix dir-
d
i
f
f
when
file does not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
m
e
r
ge-tre
e
: handle directory/empty co
n
flict corr
e
ctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keeping
t
/
Mak
e
f
ile: remove smoke test
t
argets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merge-tree:
fi
x
typo i
n
"both cha
n
ged
i
dentically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transport-helper: add
'signed
-
tags' capabilit
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
epi
n
g
t
r
ansport-h
e
lper: pass --
s
ig
n
ed-tags=w
a
rn-
s
t
r
ip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast-export: add
--signed-ta
g
s
=warn-strip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/test
-
lib
.
sh: fix TR
A
SH_D
I
R
ECTORY
h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
ee
p
ing
m
e
r
ge-t
r
ee: do
n
'
t
print en
t
ries that mat
c
h "
l
ocal"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
gitr
e
mote-
h
e
l
pers(
1
)
:
clari
f
y
refspec behav
i
o
ur
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
Keepi
n
g
subm
o
dule: print graph out
p
u
t n
e
xt to subm
o
d
u
le
l
og
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
di
f
f: allow unstuck
a
r
g
u
m
e
nts with
--diff-al
g
orithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-m
e
rge(1
)
: document diff-algorithm option
t
o
merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bis
e
ct: av
o
i
d signed
integer ov
e
r
f
low
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
Kee
p
ing
diffc
o
re-break: don't di
v
ide
b
y
zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: run --dir-
d
i
ff tes
t
s wi
t
h and
w
ithout
s
ym
l
inks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t
7
800: fix tests when
d
ifftoo
l
uses -
-
no
-
symlink
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7
8
00: don't
hi
d
e grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
epin
g
diff
t
ool:
d
on't overw
r
ite m
o
dified f
i
le
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7800: move
'--
s
ym
l
inks' sp
e
cific
test t
o
the en
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
Jo
h
n Keeping
merge-t
r
ee: fix
typo in
m
erg
e
-tree
.
c::unr
e
s
olved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Kee
p
in
g
refs
.
c: fix fread
e
rror handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keepin
g
entry: f
i
x
fi
l
te
r
l
ookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
t2
0
0
3: modernize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keep
i
n
g
d
ifft
o
ol --dir-diff:
sy
m
link all files
m
atch
i
ng t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keeping
di
f
ftool: avoid
dou
b
le slashes
in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
git-difft
o
ol(1): fix formatting of --
s
ymlink des
c
ription
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "grap
h
.
c: mark pr
i
vate f
i
le-s
c
ope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile: make
ma
n
d
i
r, html
d
ir
a
nd i
n
fodir absolu
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epi
n
g
rebase -i: resp
e
ct
core
.
comm
e
n
t
char
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keep
i
ng
co
m
bine
-
d
iff
.
c
: teach
c
omb
i
n
e
d
dif
f
s about lin
e
pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
dif
f
.
c: use diff_line_prefix() wh
e
re ap
p
li
c
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Ke
e
pi
n
g
diff: add diff_li
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 cons
t
ant string arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff:
w
rite pref
i
x to the correct f
i
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
graph:
outp
u
t pad
d
in
g
for merge subsequent pare
n
ts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038:
a
d
d
t
e
sts fo
r
"dif
f
-
-cc -
-
r
a
w <trees
>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn K
e
e
ping
builtin/apply: tig
h
ten (dis)si
m
ilarity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merg
e
tool--
l
i
b:
l
ist us
e
r configured too
l
s in '-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John
Keep
i
ng
Rename {gi
t
- => git}rem
o
te-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
ohn Ke
e
ping
CodingGu
i
del
i
nes: add Py
t
hon cod
i
ng gu
i
delines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git
-
remot
e
-testpy: fix path
h
ashing
o
n Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
K
ee
p
in
g
me
r
getool--lib: d
o
n
'
t call "exit
"
in setu
p
_to
o
l
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Ke
e
ping
git-difft
o
ol: us
e
git-
m
ergetool--lib fo
r
"--tool-
h
elp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-mer
g
etool: don't hardcode
'mergeto
o
l
' in
show_to
o
l_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keepi
n
g
git-mergetool: remo
v
e redundant assign
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git
-
m
e
rg
e
tool: move sh
o
w_to
o
l
_hel
p
to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-remot
e
-testpy
:
cal
l
p
r
int as a functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keeping
git-remote-testpy: don
'
t
d
o
unbu
f
fered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-re
m
ote-test
p
y:
hash bytes
explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
svn-fe: allow sv
n
rdum
p
_s
i
m
.
py to run
w
i
t
h Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_
h
elpers
:
use 2to3 if building
with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git_remote_helper
s
: f
o
rce rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n Keepi
n
g
git-cvsimport
.
t
x
t
: cvsps
-
2 is de
p
rec
a
ted
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n
Keep
i
ng
gi
t
-for-each-ref
.
t
x
t: 'raw
'
i
s
a suppor
t
ed date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
eping
git_remote_helpers: fix
i
nput when
r
unni
n
g
unde
r
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Ke
e
ping
git_remote_helper
s
: allow b
u
i
l
ding with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keepi
n
g
git-svn:
t
e
a
ch find-rev to
f
ind
near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fa
s
t
-
import(1): r
e
o
rganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Keeping
g
it-fast-imp
o
rt(1): combine document
a
tion of --[
n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n Kee
p
ing
git-shortlog(1): document b
e
havio
u
r of zero-wid
t
h wr
a
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John
K
eepin
g
gi
t
-fast-import(1
)
:
re
m
ove
dupli
c
a
t
e
'
-
-
d
one' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
ee
p
i
ng
Docume
n
t
ation: d
o
n't
link
to example
m
ail ad
d
ress
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
Jo
h
n
K
e
e
p
i
n
g
rebase -i conti
n
ue: don
'
t
s
k
ip comm
i
ts that only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree