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
John
Keeping
me
r
ge
-
tree: fix ty
p
o in me
r
ge-tree
.
c
:
:
u
nresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John Keeping
ref
s
.
c:
f
ix fread error handlin
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepin
g
entry:
fix
f
i
l
ter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
t20
0
3
:
modernize style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
dif
f
t
o
ol --dir-dif
f
: symlink all files matc
h
ing the
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
K
eeping
difftool: avoid double
s
lashes
in sym
l
ink
t
a
r
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
gi
t
-
difftool(1): fix
f
ormatting of --symlink
d
e
s
criptio
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
J
ohn Keeping
Revert "graph
.
c: mark private f
i
l
e-sc
o
pe
symbo
l
s
as
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
reba
s
e -i:
r
espect cor
e
.
c
o
m
mentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n Keeping
combine-diff
.
c: te
a
c
h
combined
diffs about line pre
f
ix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
pi
n
g
diff
.
c: u
s
e diff_line_prefix(
)
where ap
p
licab
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
diff: add di
f
f
_line_pre
f
ix f
u
nc
t
ion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keepin
g
di
f
f
.
c
: make
constant stri
n
g argum
e
nts
c
o
nst
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
Keeping
diff: w
r
i
t
e prefix to
the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keepi
n
g
graph:
o
u
tpu
t
p
ad
d
i
n
g for merge
subsequen
t
par
e
nts
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
o
hn Keeping
t4038: a
d
d
tests
f
or "d
i
ff
-
-cc --raw <trees>
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
b
uiltin/apply: tight
e
n (
d
is)similarity index
parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n K
e
eping
mergetool-
-
l
i
b: list user
c
o
nfigured tools in '--t
o
o
l
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Ren
a
me
{
git-
=
>
gi
t
}
remote-he
l
pers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n Keeping
Codi
n
gGuide
l
ines: add Python co
d
in
g
guideli
n
es
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
git-rem
o
t
e
-
tes
t
py: fix pat
h
hashing
o
n Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
J
ohn Keeping
merget
o
ol-
-
lib:
d
on't
call "exit" in
set
u
p_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepin
g
g
i
t-dif
f
tool: use
git-mergetoo
l
--lib for "--tool-he
l
p"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Ke
e
ping
git-
m
erget
o
ol:
do
n
'
t hard
c
ode '
m
e
r
get
o
o
l' in show_
t
ool
_
help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git
-
mergetoo
l
: remove redundant as
s
ig
n
ment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eepin
g
g
it-mergetool: move show_tool_
h
elp
t
o
m
e
rge
t
ool--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-r
e
m
ot
e
-testp
y
: call print a
s
a functi
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
gi
t
-remote-testpy: don'
t
do unbuffered text I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Kee
p
i
n
g
gi
t
-remot
e
-testpy: h
a
s
h
by
t
es expl
i
citly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Ke
e
ping
svn-fe: al
l
ow svnrd
u
mp_
s
im
.
py
t
o
run wi
t
h
Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn Kee
p
i
ng
g
it_r
e
m
o
te_h
e
lper
s
:
use
2
to3 if build
i
n
g with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John
K
eeping
git_rem
o
t
e_helpers: force rebuild if python version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimport
.
txt: c
v
sps-2 is depreca
t
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
o
hn Keeping
git-for-each-r
e
f
.
tx
t
: 'ra
w
' i
s
a supported date f
o
rma
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John Keeping
gi
t
_remote
_
he
l
pers: fix inpu
t
wh
e
n ru
n
ni
n
g
under Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
John K
e
eping
git_re
m
ote_helpers: al
l
ow building
wi
t
h Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
Joh
n
Keepin
g
git-svn: teach fin
d
-rev to
f
ind near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Ke
e
pi
n
g
git-f
a
st-import(1): re
o
rganis
e
options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn Keeping
git-fast-import(1):
c
ombine docu
m
entation of --
[
no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John K
e
eping
git-sho
r
tlog(
1
): document behaviour of zero-width wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
Joh
n
K
e
eping
gi
t
-fast-import(1): remove d
u
plicate
'
-
-
done' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Keep
i
ng
D
o
cumentati
o
n: don't link to example mail addre
s
s
es
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
reba
s
e -i continue: don't skip
co
m
m
i
ts
t
hat only c
h
a
n
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree