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
Merge branch 'jc/remove-treesame-parent-in-simplify-merges'
2013-03-27
J
o
hn Keep
i
n
g
merge-tree:
fi
x
typo in merge-tree
.
c::unresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
J
o
hn
K
eepin
g
refs
.
c: fix fread error handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
entry: fix filter looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
hn Keep
i
ng
t20
0
3: m
o
dernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eep
i
ng
d
i
fftoo
l
--
d
ir-diff: symlink
a
ll files matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
difftool:
avoid double slashes in symlink
t
arget
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
J
o
h
n Keeping
git-di
f
ftool(1)
:
f
ix formatt
i
ng
of --
s
y
m
link d
e
scr
i
p
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
o
h
n
Keep
i
ng
Revert
"graph
.
c: mark private file-scope sym
b
ols
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
re
b
a
se -i: respec
t
core
.
commentcha
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keepin
g
co
m
bin
e
-diff
.
c
:
teach co
m
b
ined di
f
f
s
about
l
ine
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Joh
n
Keeping
diff
.
c: u
s
e
diff_lin
e
_pre
f
ix()
w
h
ere applic
a
ble
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
oh
n
Keeping
diff:
a
d
d
di
f
f_line_pr
e
fi
x
functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn K
e
epin
g
dif
f
.
c: make cons
t
ant s
t
ring argu
m
ents con
s
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
pin
g
di
f
f: wri
t
e
p
refix to th
e
co
r
rect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output padding
for merge subsequent parent
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keep
i
ng
t4038: add tests for
"
dif
f
--cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
h
n Keeping
builtin/
a
ppl
y
: tighten (dis
)
simi
l
ar
i
ty inde
x
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n Keeping
merget
o
ol--
l
ib:
l
ist use
r
configured to
o
ls
i
n '
-
-t
o
ol
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git-
=
> git}
r
emote-helpers
.
tx
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John
Keeping
CodingG
u
idelines:
a
dd Python c
o
d
ing guidelines
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
gi
t
-remote-testpy: fix path ha
s
hin
g
on P
y
thon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Ke
e
ping
me
r
g
etool-
-
lib: don't call "exit
"
in setup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
in
g
git-difftool: use
g
it-mergetoo
l
--lib
for "--t
o
ol-he
l
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
git-m
e
rgetool: don't hardc
o
de 'merg
e
t
ool'
i
n s
h
ow_tool_h
e
l
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keepi
n
g
git-merget
o
ol
:
remove redundan
t
a
ssig
n
me
n
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-mergetool:
move
s
how_tool_he
l
p to merge
t
ool--li
b
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keeping
gi
t
-rem
o
te-t
e
stpy: cal
l
print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepin
g
git-remo
t
e-testpy: don't do unbuffere
d
text I/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keep
i
ng
g
it-r
e
mote-te
s
tpy: hash bytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John K
e
eping
s
vn-fe: allow svnrdu
m
p_sim
.
py to run with Pytho
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn K
e
e
p
ing
gi
t
_r
e
mote_helpers: use 2to3
if building with
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
Keeping
git_re
m
ote_h
e
lpers:
f
orce rebuild if python ver
s
ion
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
Jo
h
n K
e
ep
i
ng
g
i
t
-cvsimport
.
txt:
cvsps-2
i
s
deprecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-each-
r
ef
.
t
xt: 'raw' is
a
supported
d
ate format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn Keeping
git
_
remote_he
l
pers: fix input when running under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
Jo
h
n
K
ee
p
in
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 Keepi
n
g
git-svn: te
a
ch
find-rev to find near matche
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast
-
i
mpo
r
t(1): reor
g
anise op
t
ion
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn K
e
eping
g
it-fast-import(1): combine doc
u
mentation of
-
-[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
it-shortlog(1):
d
ocu
m
ent behav
i
our
of zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
J
ohn Kee
p
ing
g
i
t
-fast-import(1): remo
v
e duplic
a
te '--don
e
' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
Joh
n
Keep
i
ng
D
o
cumentation:
don't link to example mail ad
d
r
e
sses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
J
ohn Keepin
g
r
e
bas
e
-i con
t
inue:
don't s
k
i
p commits
t
h
at only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree