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 'maint-1.8.1' into maint
2013-03-27
John Kee
p
ing
m
erg
e
-
tre
e
: f
i
x typo in
merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keeping
Revert "graph
.
c:
m
ar
k
private
f
ile-scope symbols as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
r
ebase -
i
: respect 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 about li
n
e prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
oh
n
Keeping
diff
.
c: use
d
i
ff_l
i
ne
_
prefix() wh
e
re applica
b
le
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
d
i
ff: add diff_l
i
ne_prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
diff
.
c
:
make cons
t
ant string
a
rguments const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
ng
diff:
write prefix to t
h
e
correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
ohn
K
eeping
gr
a
p
h
: output paddi
n
g for me
r
ge 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 <tre
e
s>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/apply: tig
h
ten (dis)similarit
y
index
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
merget
o
ol--lib: list user
c
o
nfigured tools i
n
'-
-
tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
J
o
hn Keepin
g
R
ename
{
git-
=
> git}remote-help
e
rs
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keeping
CodingGuidelines: add
Python coding
gui
d
elines
commit
|
commitdiff
|
tree
2013-01-28
J
o
hn K
e
e
p
ing
git-r
e
m
ote-testpy: fix path has
h
ing on Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Joh
n
Keepi
n
g
mer
g
e
t
o
o
l--lib:
d
on't call "exit" in setup_
t
ool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-difft
o
ol: use
git
-
merget
o
o
l
--lib for "
-
-tool-help
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git-merg
e
t
ool: d
o
n't har
d
c
ode 'mergetool' i
n
show_tool_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t
-mergetool: r
e
move red
u
ndant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
e
eping
git-mergeto
o
l:
mov
e
show_tool
_
help to mergetool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it-remote-testpy
:
ca
l
l pr
i
nt as a f
u
n
ctio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
g
it-remote-tes
t
py: don't do unbuffe
r
ed text
I
/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
epi
n
g
git
-
remot
e
-testpy
:
hash by
t
es explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keepin
g
svn-fe:
allow svnrdump_
s
im
.
py to run w
i
th P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git_remote_h
e
lper
s
: use 2
t
o3
i
f buildin
g
w
i
th Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
git_
r
emote_helper
s
:
force rebuild
i
f python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keep
i
ng
gi
t
-
c
vsimp
o
rt
.
t
xt: cvsp
s
-2 is deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
ohn Keeping
git-for-each-ref
.
t
xt: 'raw' is a su
p
ported
d
a
t
e f
o
r
ma
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John
Keeping
git_remote_helpers: fi
x
i
np
u
t when ru
n
ning under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Kee
p
i
n
g
gi
t
_remote
_
h
e
lpers:
a
llow building
with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Ke
e
ping
git-
s
vn:
t
each find-rev to find near m
a
tches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Kee
p
ing
g
i
t-f
a
st-impor
t
(1)
:
reorgan
i
se op
t
ions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
eping
git-fast-import(
1
): combine docu
m
entation of
--
[
no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n
Keepi
n
g
gi
t
-
s
hort
l
og(1
)
: document
behaviour
o
f
z
e
ro-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fa
s
t-import(1): remove duplica
t
e '-
-
done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keeping
D
ocumentation:
don't link t
o
e
xample mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
Jo
h
n Keeping
rebase -i
continue: don't
s
ki
p
commi
t
s that only cha
n
g
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree