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
Merge branch 'mh/fetch-into-shallow' into maint
2013-05-17
John Keeping
difft
o
ol: fix d
i
r-diff when
file doe
s
not exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
Joh
n
Keeping
mer
g
e-tree:
h
and
l
e
direct
o
ry/e
m
pty conf
l
i
c
t correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John
K
eeping
t/Makef
i
le: remove smoke test targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keepi
n
g
me
r
ge-tree: fix
t
y
po
i
n
"
both change
d
i
dent
i
cally"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
e
eping
transport-
h
elper: add 'signed-tags' capability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
t
r
ansp
o
rt-helper: pass --signe
d
-tags=warn-stri
p
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
fast
-
export: add
--
s
igned
-
tags=warn-
s
trip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keeping
t/test-l
i
b
.
s
h
:
f
i
x
TRAS
H
_DI
R
E
C
TORY
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepin
g
m
e
r
g
e-tree: don't
p
r
int entries that ma
t
c
h
"local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
John
Keeping
gitre
m
ote
-
hel
p
ers(1): clarify refspec behaviour
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keepin
g
submodule: print graph ou
t
put
ne
x
t to s
u
bm
o
dule log
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
Jo
h
n Kee
p
ing
diff: allow
unstu
c
k argu
m
ents with
-
-diff-algori
t
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
git-merge(
1
)
: document diff-algorithm option
t
o merge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
bis
e
c
t
: avo
i
d
signe
d
i
n
t
eger overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John
K
eepi
n
g
d
i
ffcore-break:
don't di
v
ide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t
7
8
00:
r
un --dir-diff te
s
ts wi
t
h a
n
d
withou
t
symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
epin
g
t7800:
fix tests whe
n
difftool uses
--no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn K
e
e
p
i
ng
t7800: d
o
n't
h
ide g
r
ep
output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn K
e
eping
di
f
fto
o
l: don't ov
e
rwrite modif
i
ed files
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
e
e
ping
t7800: move '--symlinks' specific t
e
st to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
J
ohn Ke
e
pi
n
g
m
erg
e
-tree: fix typo in merge-tre
e
.
c::
u
n
r
esolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
K
eeping
ref
s
.
c
:
fix fread erro
r
h
andlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
entr
y
: fix filter lo
o
kup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
t200
3
:
m
o
dernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keep
i
n
g
d
if
f
tool --dir-diff: symlin
k
all files matchin
g
the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keeping
d
i
ff
t
ool: a
v
o
i
d double slashes in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Joh
n
Kee
p
ing
g
i
t-difftoo
l
(1): fix
f
o
r
m
a
tting of --symlink de
s
cript
i
on
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Re
v
e
rt "graph
.
c
: mark priva
t
e file-scope symbo
l
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
John Kee
p
i
n
g
Make
f
ile: ma
k
e mandir, htmldir
a
n
d info
d
i
r
abs
o
lute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
r
ebase -i
:
respect
c
ore
.
c
ommentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keepin
g
com
b
i
ne
-
di
f
f
.
c: teach com
b
ined diffs about line p
r
efix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff
.
c
: use diff_line_prefix
(
) where appli
c
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: add
d
i
ff_line_prefix fu
n
ctio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
d
i
ff
.
c: make constan
t
st
r
in
g
arguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff: wri
t
e prefi
x
to the correct fil
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
Jo
h
n K
e
eping
grap
h
:
out
p
ut padding for mer
g
e subsequent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t4038: add tests for "diff --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
Keep
i
ng
builtin/
a
pply: ti
g
hten (di
s
)similarity index parsi
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Kee
p
ing
m
ergetool--l
i
b: li
s
t user con
f
igu
r
ed t
o
ols in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Ke
e
ping
Renam
e
{git
-
=> gi
t
}remote-
h
elpe
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
J
o
h
n Keeping
CodingGuidelines: add Python c
o
ding gu
i
deli
n
es
commit
|
commitdiff
|
tree
2013-01-28
John Ke
e
pi
n
g
git-rem
o
te-
t
estp
y
: fix p
a
t
h
hashing on
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keepin
g
me
r
ge
t
ool
-
-li
b
: don't
c
al
l
"
exit" in
s
etup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
ing
git-difftool: use g
i
t-mer
g
etool--lib for "--t
o
ol-help"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eep
i
n
g
git-mergetoo
l
: don't hardcode
'
mergetool
'
in show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
ing
git-mergetool: remov
e
redundant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Keeping
git-mergetool
:
mov
e
show_tool_help to
m
ergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git-r
e
mote-
t
estp
y
: call pr
i
nt
as a func
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-rem
o
te-te
s
tpy
:
d
o
n't do
unbuffered
t
ext I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
git
-
remote-t
e
stpy: h
a
sh by
t
e
s explic
i
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
ee
p
in
g
svn-fe: al
l
ow svn
r
du
m
p_s
i
m
.
py to run wit
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git_remote
_
h
e
l
p
ers
:
use
2to3 if building wi
t
h
Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
git_remote_helpers: f
o
rce rebuild if p
y
thon
version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Kee
p
ing
g
i
t-cvsim
p
ort
.
tx
t
:
c
vsps-2 is deprecate
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Ke
e
p
i
ng
git-for-e
a
ch-ref
.
txt: 'ra
w
' is a
supported date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
e
p
i
n
g
git_re
m
ot
e
_helpers: fix input when running
u
nder Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
git_
r
emote_
h
elpers: allow building wi
t
h Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
gi
t
-svn:
t
each find-rev
t
o find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it-fast-import(1): reorg
a
nise
o
p
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
pin
g
git-fast-import(1): c
o
m
b
ine document
a
tion of --
[
n
o
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Kee
p
i
n
g
git-shortl
o
g(1): document b
e
haviou
r
of zero-wid
t
h w
r
ap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
gi
t
-fast-imp
o
rt(1): remove
dupl
i
cat
e
'--done' o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
e
eping
Docum
e
ntation: don't link to
e
xample mail addre
s
ses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
r
e
base
-
i continue: don't s
k
ip commits that
o
nly chang
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree