repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
difftool: fix dir-diff when file does not exist in working tree
2013-05-17
J
o
h
n
K
ee
p
ing
d
if
f
tool: f
i
x dir-dif
f
when file
d
oes not ex
i
s
t
in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John
K
eep
i
ng
merge-tr
e
e: handle director
y
/empty conflict
correc
t
ly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
ing
t
/M
a
k
e
file: remove smoke test
t
a
rg
e
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-t
r
ee: fix typ
o
in
"
both changed ident
i
cally"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
tran
s
port
-
helper: add 's
i
gned-
t
ag
s
' capabil
i
ty
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John
Keepin
g
transport-h
e
lper:
p
ass --
s
igned
-
t
a
g
s
=warn-
s
tr
i
p to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepin
g
f
ast-export: add --sign
e
d-tags=w
a
rn-stri
p
mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t/tes
t
-lib
.
sh:
f
i
x
TRASH_DIRECTORY handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
J
o
hn Kee
p
ing
mer
g
e
-t
r
ee: don't pri
n
t
entries that match "loc
a
l"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John
Keeping
g
i
tremote-he
l
pers(
1
):
c
lar
i
fy refspec behaviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
e
pin
g
sub
m
odule: prin
t
graph output next to submodule log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
diff: a
l
low unst
u
ck arguments
w
ith
-
-dif
f
-algori
t
hm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John
K
e
eping
g
i
t
-
mer
g
e(1): docum
e
nt diff-algorithm option to merge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn
K
e
e
pi
n
g
b
isect: avoid signed intege
r
o
v
erflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
diff
c
o
re-break: don't di
v
ide
by zero
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keepi
n
g
t7800: r
u
n --dir-
d
iff tests with and without symlink
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keep
i
ng
t
7800: fix te
s
t
s when di
f
ftool
u
ses --no
-
symlin
k
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn
Keepin
g
t
780
0
: don't hide grep
o
utpu
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
difftoo
l
:
do
n
'
t ove
r
w
rite modified
files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John
Keeping
t7
8
00: mo
v
e '--symlinks' specific test
to the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Keep
i
ng
merge-t
r
ee: fix typo
i
n
m
erge-tree
.
c
:
:u
n
reso
l
ved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Kee
p
ing
ref
s
.
c: fix
fread error handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
entry:
fix filter lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
t200
3
:
m
o
d
erniz
e
style
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
K
eeping
difftool
-
-dir-diff
:
sy
m
link all file
s
m
a
tchi
n
g
t
he
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
Keep
i
n
g
difftool
:
avoid double sl
a
shes in symlink targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
git-dif
f
to
o
l(1)
:
fix
format
t
ing of
-
-symlink
des
c
ript
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keepin
g
R
evert "graph
.
c
: mark private
f
ile-scope symbo
l
s
a
s
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keep
i
ng
Mak
e
file: ma
k
e mandir, h
t
mldir and inf
o
dir absolute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
rebase -i: respect
c
ore
.
com
m
entchar
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Ke
e
ping
c
ombine-di
f
f
.
c: teach
c
om
b
ined diff
s
a
bout lin
e
p
r
efix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
ing
diff
.
c
:
use
d
iff_l
i
ne
_
pre
f
ix(
)
where applicable
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John K
e
epi
n
g
d
iff: add diff_line_
p
r
e
fix function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
K
eeping
d
iff
.
c:
m
ake constant string argu
m
en
t
s const
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eepi
n
g
diff: write prefix to the correct fil
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output pa
d
din
g
for merge s
u
bsequent parents
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4038: add tests fo
r
"
diff --
c
c --raw <t
r
e
es>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keep
i
n
g
built
i
n/apply: tighten (dis)similarity inde
x
par
s
ing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
m
ergetool--lib
:
list u
s
er
c
onfigu
r
e
d t
o
ols
i
n '--tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Renam
e
{git- =>
g
it}r
e
mote-helpers
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n
Keeping
Cod
i
ngGuidelines: add Python codi
n
g
guideline
s
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
git-rem
o
te-t
e
s
tpy:
fi
x
p
ath hashing on
Pyt
h
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib:
d
on't call
"
exit
"
in
s
etup_
t
ool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-difft
o
ol: use g
i
t
-mergetool--lib for "--t
o
ol-hel
p
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-m
e
rgetool: don't hardcode 'merg
e
t
ool
'
i
n
s
h
ow_t
o
ol_hel
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-merget
o
ol:
r
e
m
ove red
u
ndant assignment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Keeping
git-merg
e
tool: move s
h
ow_tool_help
t
o mergetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-remote-testpy: call print as a f
u
nction
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
Keep
i
ng
git-remote-testpy: don't do u
n
b
u
ffered text I/O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
K
e
e
pin
g
git-re
m
ote-testpy: hash bytes explic
i
tly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
s
vn-fe: allo
w
svnrdump_sim
.
py
t
o
r
un with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git_
r
emote_
h
elpers: us
e
2to3
if b
u
i
lding with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote
_
helpers: f
o
rce rebuild if python ve
r
sion
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
g
it-cvsimport
.
tx
t
: cvsps-2 is
d
e
p
recat
e
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eeping
git-for-each-
r
ef
.
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
g
i
t_remote_h
e
lpers: fix input w
h
en runnin
g
u
n
der Py
t
ho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n Keeping
git_remote_h
e
lpe
r
s: a
l
lo
w
building with Pytho
n
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
John
K
eeping
git-svn: teach fin
d
-r
e
v to fi
n
d near mat
c
h
e
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n K
e
eping
git-fa
s
t-import(1): reorganise opt
i
ons
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-im
p
ort(1): co
m
bine documentation of
-
-[n
o
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-shortlog
(
1):
document behaviour
of
zero-w
i
dt
h
w
r
a
p
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
John Keepin
g
g
it-fa
s
t
-
import(1
)
: remo
v
e dupli
c
ate '--done' opt
i
on
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
Jo
h
n
Keeping
Documentation: don'
t
link to example mail addresses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
Jo
h
n Keeping
rebase -i contin
u
e:
d
on't s
k
ip commits
t
h
at only change
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree