repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7401: make indentation consistent
2013-06-17
John Kee
p
ing
t7401: make in
d
en
t
ati
o
n consis
t
e
n
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-17
J
o
hn Keepi
n
g
difftool: fix dir-diff when file
d
o
e
s not exist
in
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-05-07
John Ke
e
p
ing
merge-t
r
ee: ha
n
d
l
e dire
c
tory/empty c
o
nflict correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Kee
p
ing
t/Makefile: remov
e
smok
e
test targets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
merg
e
-
tree:
fix typo in "both change
d
identically"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
t
r
ansport-he
l
per: add 'sign
e
d-tags'
c
apability
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
transport-helper: pass --signed
-
tags=warn-strip to
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
fast
-
export: a
d
d
-
-signed
-
tags
=
warn-s
t
rip mode
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n Ke
e
p
in
g
t/test-lib
.
sh:
f
i
x TRA
S
H_DIRECTORY handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John
Keep
i
ng
m
e
rge-tree: don't p
r
i
nt entries t
h
at matc
h
"loca
l
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-07
John
Keeping
gitremote-
h
elpers(1):
c
larify re
f
spe
c
b
e
haviour
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
oh
n
Keeping
sub
m
odule: print
g
raph out
p
u
t next to subm
o
d
ule
log
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
J
o
hn Kee
p
ing
diff: allow unst
u
ck arguments with --diff-algorithm
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-05
John Keepi
n
g
gi
t
-m
e
r
g
e(1): doc
u
ment di
f
f-algorithm
o
ption to m
e
r
g
e
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn
K
e
epin
g
bisect: avo
i
d signed integer overflow
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-03
Jo
h
n
Keep
i
n
g
diffcore-break: d
o
n't divide by
z
e
r
o
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t
7
800: r
u
n
-
-
d
i
r
-
d
iff
tests with and without symlinks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t
7
800: fix tests when d
i
ffto
o
l uses --no-symli
n
ks
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t
7
8
0
0: do
n
't hide
grep output
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
difftool:
d
on't o
v
erw
r
ite modified files
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
t7
8
00: move '--s
y
mlin
k
s' spec
i
fic te
s
t to the end
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Kee
p
in
g
m
e
rge-tree: fix typo in
m
erge-
t
ree
.
c::
u
nr
e
solved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c: fix f
r
e
a
d error handling
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
e
n
try: fix filt
e
r lookup
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n
Keeping
t2003: modernize s
t
yle
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
diff
t
ool --dir-dif
f
:
sym
l
ink
a
ll files matching the
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
John
Keep
i
ng
difftool: avo
i
d double slashes
in symlin
k
t
a
rgets
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Keepin
g
g
i
t-difftoo
l
(1
)
: fix
f
ormatti
n
g o
f
--sym
l
ink description
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-04
John
Ke
e
ping
Rever
t
"
gr
a
ph
.
c: m
a
rk private fil
e
-scope
s
ymbols as
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-25
Jo
h
n K
e
epin
g
Mak
e
file:
make m
a
ndir,
h
t
mldir and
i
nfodir a
b
solute
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
e
e
ping
reb
a
se
-i: respect core
.
c
om
m
entch
a
r
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
combine-dif
f
.
c: teach co
m
bined
d
if
f
s about
l
ine prefix
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
d
i
ff
.
c
: use diff_line_prefix() where ap
p
licab
l
e
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
dif
f
:
add dif
f
_lin
e
_pre
f
i
x
function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
diff
.
c
:
make c
o
nstant string
a
rgu
m
ents
c
o
nst
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keeping
diff:
write prefix to t
h
e
corre
c
t file
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
epi
n
g
graph: o
u
tput padding
for merge
subsequent
p
are
n
t
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
Jo
h
n Keepin
g
t4038
:
ad
d
tes
t
s for "
d
iff --cc
-
-
raw <tr
e
es>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builti
n
/app
l
y:
t
i
ghten (dis)si
m
ilarity i
n
d
e
x parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Kee
p
ing
merget
o
ol--lib: list user
configured
t
ools in '-
-
tool
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Renam
e
{gi
t
-
=
> g
i
t}r
e
mote-helpers
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-30
John
Keeping
Codi
n
gGuidelines:
add
P
ython
c
oding guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keeping
g
it-remote-t
e
stpy:
fix path hashi
n
g on Pyth
o
n 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-28
John Kee
p
ing
mergetool--lib: don't call
"
e
x
i
t"
in setup_
t
ool
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
e
p
ing
git-
d
ifftool:
u
se git-me
r
g
e
tool--lib for "--tool-help"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-mergetool: don't ha
r
dcod
e
'
m
erg
e
tool' in show_tool_help
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Kee
p
ing
g
it
-
mergetool: remove
r
edundan
t
as
s
ignment
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-me
r
getoo
l
: move sho
w
_tool_he
l
p t
o
mergetool--lib
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keep
i
ng
git-remote-testpy: call print as a function
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-remo
t
e-tes
t
py: don't do unbuff
e
red text I/
O
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John
K
ee
p
ing
git-remote-testpy:
h
as
h
bytes
exp
l
icitl
y
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
svn-fe: all
o
w svnrdump_sim
.
py to run
wit
h
P
ython
3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_r
e
mote_he
l
pers: use 2to3 if
b
uilding wit
h
Pyt
h
on 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git_remote_
h
elp
e
rs: force rebuild
if
python vers
i
o
n
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John
Keeping
git-cvsim
p
ort
.
tx
t
: c
v
s
p
s-2 is deprecated
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
John
Keeping
git-for-each
-
r
ef
.
txt:
'
r
a
w' is a suppor
t
e
d
date for
m
at
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
eping
g
it_
r
emot
e
_
he
l
pe
r
s: fix
i
nput when runn
i
n
g
under Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-21
John Keepi
n
g
git_re
m
ote
_
h
e
lpers: allow
b
uil
d
ing with Python 3
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-17
John
K
eepin
g
git-sv
n
:
t
each
f
i
n
d-r
e
v to
f
ind near
matches
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
git-fast-import(1):
r
e
o
rganis
e
o
ptions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Kee
p
ing
git-
f
ast-
i
mport(1): combine documentation of --[no
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John
K
eeping
g
it-shortlo
g
(1): doc
u
men
t
b
ehaviour of zero-w
i
dth wrap
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
Jo
h
n Keeping
gi
t
-
f
ast-impor
t
(
1): remove du
p
li
c
ate '--done' option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
Docum
e
ntat
i
on:
don't link to example mail addre
s
ses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
J
o
hn Ke
e
ping
r
ebase -i contin
u
e: d
o
n't
skip commits tha
t
only cha
n
ge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree