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 'jk/difftool-no-overwrite-on-copyback'
2013-03-29
John
K
eeping
t7800:
r
u
n
-
-
dir-diff t
e
sts wi
t
h
a
nd without
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n
K
eeping
t7800: fix tests when diff
t
ool uses --no-s
y
mli
n
ks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
Jo
h
n Keeping
t7800
:
don't hide grep outp
u
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
d
i
fftool:
d
on't ove
r
write modi
f
ied fil
e
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
h
n Keepi
n
g
t
7
80
0
: move '--symlinks' spe
c
if
i
c te
s
t to the e
n
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Kee
p
ing
merge-tree: fix
t
ypo in merg
e
-tree
.
c::
u
n
r
esolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
refs
.
c:
f
ix
f
read error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keepin
g
entry: fix filt
e
r look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: mo
d
ernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
difftool --dir-diff: symlink all files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
d
ifftool: avoi
d
double slashes in symlink target
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
ohn Keep
i
ng
git
-
difftool(
1
)
:
fix form
a
tting of --sym
l
ink description
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Ke
e
p
ing
Revert "graph
.
c: ma
r
k private
f
i
l
e-scope symbol
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Keeping
Makefile:
make mandir,
h
tmldir
and i
n
fo
d
ir absol
u
t
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
rebase -
i
:
r
espect core
.
c
o
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
combine-
d
iff
.
c
:
teach combined di
f
f
s
about line prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
if
f
.
c:
u
se diff
_
line_pr
e
fix() where ap
p
licable
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff
:
add diff_line_prefix func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
ping
d
i
ff
.
c: make const
a
nt string argume
n
ts con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
ng
diff: write pref
i
x t
o
the c
o
rrec
t
file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
gr
a
ph: output padding for merge subsequent p
a
r
ents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t40
3
8: add tests f
o
r "
d
iff --cc
-
-raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
h
n Ke
e
pi
n
g
builtin/apply
:
tighten (dis)similarit
y
index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Keepin
g
m
ergetool--
l
i
b: list u
s
er configured tools in '--too
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Kee
p
ing
Rename {git- => git}r
e
mote-he
l
p
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keeping
Codi
n
gGui
d
elines
:
a
dd
P
ython codi
n
g
g
u
idelines
commit
|
commitdiff
|
tree
2013-01-28
John K
e
eping
gi
t
-remote-testpy: fix path ha
s
hing on
Py
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
mergetool--lib:
d
o
n't
c
all "exit
"
in
s
etup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-d
i
f
ftool: use git-mergetool
-
-lib for "--tool-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool: don't ha
r
d
c
od
e
'mergetool' in
s
how
_
tool_h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
gi
t
-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
g
i
t
-m
e
rge
t
ool: move sho
w
_tool_help to mergeto
o
l--l
i
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-remot
e
-test
p
y
:
call
pr
i
nt as a functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keep
i
ng
git-remote-testpy: don't do
unbuffered text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git-
r
emote-test
p
y:
hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
s
v
n-fe: allow svn
r
dump_sim
.
p
y
to r
u
n with Py
t
hon
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n Ke
e
ping
git_remote_
h
elpers: use 2to3 if
b
uilding with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Kee
p
ing
gi
t
_remote
_
helpers:
f
orce r
e
build
i
f python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keepin
g
git-cv
s
import
.
txt: cvs
p
s-2 is d
e
preca
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Jo
h
n
Kee
p
ing
gi
t
-
for-each-ref
.
tx
t
: 'raw' is a supported dat
e
format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_remote
_
he
l
p
ers: fix in
p
ut
w
hen runni
n
g
under
P
y
tho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Joh
n
K
eepin
g
git_remote_helpers: allow building with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
git-
s
vn: teach find-
r
ev to find
near ma
t
ches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-import(1
)
:
r
e
organise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n Keeping
git-fast-import(1): co
m
bine documentation of
-
-[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Kee
p
i
n
g
git-sho
r
tlog(
1
): doc
u
ment behaviour of zero-width wra
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keepin
g
git-fa
s
t-import(1): remove
duplica
t
e '--done
'
opti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
Jo
h
n
K
eep
i
ng
Documentatio
n
: don't link to example mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Kee
p
ing
rebase -i
continue: don't
s
kip commits that only
c
hange
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree