repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
2013-04-07
J
o
hn Keeping
gitre
m
ote-h
e
lp
e
rs(1): clarif
y
re
f
spec behav
i
our
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
bi
s
ect: av
o
id
signe
d
integer overflo
w
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John K
e
eping
diffcore-br
e
ak
:
d
o
n't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Ke
e
ping
t7800: run
--dir-diff tests with an
d
witho
u
t
symli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
K
eeping
t7800:
f
i
x
tests w
h
en
diffto
o
l
u
ses --
n
o-symli
n
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t7800
:
d
o
n't h
i
de gre
p
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keepi
n
g
diff
t
ool: don't
overwrite
modif
i
ed
f
iles
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7
8
00: mo
v
e
'--sy
m
links' specif
i
c test to the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn
K
eep
i
ng
m
erge-tree: fix typ
o
in merge-tree
.
c
:
:
unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
Jo
h
n Kee
p
i
n
g
refs
.
c:
fix frea
d
error h
a
nd
l
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
entry: fix filter
l
o
o
kup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
t200
3
: moder
n
ize
s
tyle
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn
Keepi
n
g
difftool --dir-diff: symli
n
k
a
ll files
match
i
ng the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool: avoid
d
o
u
b
l
e
s
l
ashes in symli
n
k targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
g
i
t-
d
ifftool(1):
f
ix
f
or
m
atting of --symlink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Reve
r
t
"
graph
.
c: ma
r
k
p
ri
v
ate file-
s
cope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keeping
Makefile: make man
d
ir, htmldir and
infodir abso
l
ute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i
:
r
espe
c
t core
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
combine-diff
.
c: teach
combined diffs
a
bout li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n
Ke
e
p
in
g
d
iff
.
c: use diff_line_prefix() where appl
i
cable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add diff_li
n
e_prefix func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff
.
c: m
a
ke constan
t
strin
g
a
rguments co
n
st
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: write pr
e
fi
x
t
o the
c
orrect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
h
n
Keeping
graph: output paddin
g
for merg
e
su
b
seque
n
t
p
arents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keeping
t
4
038: add t
e
s
t
s for
"di
f
f --cc
--raw
<
t
re
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Ke
e
ping
bu
i
lti
n
/appl
y
:
tighte
n
(dis)si
m
i
l
a
rit
y
index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Kee
p
ing
mergetool--lib:
l
i
s
t
user configured
t
ools in '--to
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
Joh
n
Kee
p
i
n
g
R
e
n
ame {g
i
t- => git}remote-h
e
lpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Kee
p
ing
CodingGuidel
i
nes: add
Python coding guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
Keepi
n
g
g
i
t-r
e
mote-
t
e
stpy:
fix path hashing on Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
Kee
p
ing
m
e
rgetool-
-
l
i
b
:
don'
t
call "exi
t
" in
setup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-dif
f
tool: use gi
t
-mer
g
et
o
ol--l
i
b for "--too
l
-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keepi
n
g
git-mergetool:
d
on
'
t hardcode
'mergetool' in show_t
o
ol_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-mergeto
o
l:
r
e
move redundant assign
m
en
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keepin
g
g
it-mergetool: move show_tool_hel
p
to me
r
getoo
l
--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
K
eep
i
ng
git-remote-tes
t
py: cal
l
prin
t
as a func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
ep
i
ng
git-re
m
ote-testpy: don't d
o
unbuf
f
ered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
g
i
t-remote-test
p
y
:
ha
s
h bytes expl
i
c
itly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepi
n
g
svn-
f
e:
allow svn
r
dump_sim
.
p
y
t
o
run with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
oh
n
Keeping
git_remote_helpers: use 2to3 if building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git_re
m
o
t
e_helpers:
force re
b
uild
if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John
K
ee
p
i
ng
git-cvsimport
.
txt
:
cvsps-2 is
deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n Keeping
git
-
for-each-ref
.
txt: 'raw' is a supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git
_
remote
_
he
l
pers: fix input wh
e
n
runn
i
ng
u
nder Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Ke
e
ping
g
it_remote_h
e
lpe
r
s: allow
build
i
n
g
w
ith Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-
s
vn: teach find-rev to
f
i
nd near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fas
t
-i
m
p
o
rt
(
1): reor
g
anise optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-i
m
port(1): combine
d
oc
u
mentati
o
n of
-
-[
n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
git-
s
hortlog(1):
d
ocume
n
t
b
ehav
i
ou
r
of
z
ero-width w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
J
ohn Keeping
git-fast-import
(
1)
:
remove
d
uplicate '
-
-done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Do
c
u
mentati
o
n: don't link to
e
x
a
mpl
e
mail a
d
dresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John K
e
e
p
in
g
rebase -i continu
e
: do
n
't ski
p
c
o
mmit
s
that on
l
y ch
a
nge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree