repo.or.cz
/
git.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
ohn
Kee
p
ing
difftool: fix dir-di
f
f
w
h
en fil
e
d
oes not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree: handle directo
r
y/
e
mpty conflict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
t/M
a
kef
i
le: rem
o
ve smo
k
e
t
e
s
t targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keepin
g
merge-tree: fix typo in "bo
t
h changed
identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keepi
n
g
transport-helper: add 's
i
gned
-
tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John K
e
e
p
in
g
transport-hel
p
er: pass --signed-
t
ags
=
warn-strip
t
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
fa
s
t-expo
r
t
: add --signed-tags=
w
a
rn-st
r
i
p mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
ohn
K
e
ep
i
ng
t/test-lib
.
sh: fix TRASH_
D
I
RECTORY h
a
ndling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepin
g
merge-tree: do
n
't
p
r
i
nt entries that matc
h
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John Keeping
git
r
emo
t
e-hel
p
e
r
s
(
1): cl
a
rify refsp
e
c behaviou
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Joh
n
K
eeping
subm
o
d
ule: pri
n
t graph output next to submodule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn K
e
eping
diff: allow unst
u
ck
a
rgumen
t
s wi
t
h --diff-alg
o
r
i
t
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
ohn Kee
p
ing
git-me
r
g
e
(1): doc
u
ment d
i
ff-algorithm option to merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
Joh
n
Keeping
bis
e
ct
:
avoid
signed i
n
te
g
e
r overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
h
n
K
eepi
n
g
diffcore-break: don'
t
divi
d
e
b
y zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
e
p
ing
t7800
:
r
u
n --
d
ir-di
f
f tests w
i
th and witho
u
t symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: fi
x
t
e
sts w
h
en
difftool uses --no-
s
y
m
links
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
8
00:
don't hide gr
e
p
ou
t
put
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John K
e
eping
d
i
fftool: d
o
n't
ove
r
write modified f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
t7800: move '--symlinks' s
p
eci
f
ic
test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John
K
eepin
g
merge-tr
e
e: fix typo in
merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn Keeping
refs
.
c: fix fread e
r
ror
handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
entry: fix filter look
u
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003:
m
oderni
z
e style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n
Ke
e
p
i
n
g
difftool --dir-diff: symlink all
files matching the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
d
ifftool: avoid
d
o
ub
l
e slashes in
sy
m
link targe
t
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n K
e
eping
g
i
t-difftool(1): fix fo
r
matting of --sy
m
li
n
k descr
i
p
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
Jo
h
n Keeping
Rever
t
"graph
.
c: mark private fi
l
e-sc
o
pe symb
o
ls as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
Joh
n
Keeping
Makef
i
l
e
: mak
e
mandir, htmld
i
r an
d
infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase
-
i
: respect c
o
r
e
.
comment
c
ha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
com
b
i
n
e-diff
.
c: t
e
a
ch combine
d
diffs ab
o
u
t
line
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Kee
p
ing
diff
.
c: use diff_line_p
r
efix(
)
where app
l
ic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: ad
d
diff_line_prefix
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
p
i
ng
diff
.
c: make constant string a
r
g
u
me
n
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Kee
p
i
ng
d
i
ff:
wri
t
e
prefix to t
h
e correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John K
e
eping
graph:
o
utput paddin
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 tests for "diff -
-
cc -
-
r
a
w <
t
rees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keeping
b
uiltin/apply
:
tighten (dis)simila
r
ity
index par
s
ing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn
K
e
eping
mergetoo
l
--lib: list user c
o
nfigure
d
tools in
'
--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Ren
a
me
{
gi
t
- =>
g
i
t}
r
e
mote-helpers
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John K
e
epin
g
C
odingGui
d
elines: add Pytho
n
coding guidel
i
nes
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-remote-t
e
stpy: fix path hashi
n
g on Pyt
h
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn Keepin
g
mer
g
etool--
l
ib:
d
o
n
't cal
l
"exit" in s
e
t
up_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epin
g
git-diff
t
ool: use
g
it-merget
o
ol--lib for "--tool-
h
elp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git
-
mergetool: don't hardcode 'mergetool' in
sho
w
_t
o
o
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merge
t
o
o
l
:
re
m
ove redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
Keepi
n
g
g
i
t-me
r
getool: move show_
t
ool_
h
elp to merget
o
o
l
-
-
lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-remote-testpy: call pr
i
nt as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epi
n
g
g
i
t-remo
t
e
-
testpy: don't do unbuffered te
x
t
I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-remote-testpy: hash bytes explicit
l
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Ke
e
p
ing
svn-fe
:
allow svnrdump_si
m
.
py to run with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eeping
git_rem
o
te_helpers: u
s
e 2to3 if build
i
ng with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
e
p
ing
git_remote_helpers: force rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Joh
n
Keeping
git-cvs
i
mpor
t
.
txt:
c
vsps-2 is dep
r
ecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John
K
eeping
git-for-eac
h
-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_helpers: fix inp
u
t wh
e
n r
u
nning under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
g
it
_
remote_help
e
rs: allow buildin
g
with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
o
h
n Keeping
git-svn: teach find-rev 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-
i
mport
(
1): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-impor
t
(1)
:
combin
e
d
o
cumen
t
a
t
ion of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Joh
n
Keepin
g
git-s
h
ortlog(1): docum
e
n
t
behavi
o
ur
of zero-width w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-import(1): remove
dup
l
icate
'--d
o
ne' o
p
ti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
J
ohn K
e
e
ping
D
ocumen
t
ati
o
n: don't link t
o
example mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John K
e
eping
rebase -i continue:
d
o
n
'
t
s
k
i
p commits
t
hat only c
h
an
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree