repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-tree: handle directory/empty conflict correctly
2013-05-07
John
K
e
e
pin
g
me
r
ge-tre
e
: h
a
n
dle
directory/empty conf
l
i
c
t correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Ke
e
pi
n
g
merge-tre
e
: fix typo in "both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merg
e
-
t
r
ee: don'
t
p
rint
e
ntries that match "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keep
i
ng
me
r
ge-t
r
e
e:
fix
t
yp
o
i
n
merge-tre
e
.
c::
u
nresol
v
ed
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
J
ohn Keep
i
ng
t
4
038: add tests
f
or "diff --
c
c --raw
<
trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
ohn Keeping
builtin/apply: tigh
t
en (dis)
s
i
m
ilarity
i
n
d
ex p
a
rsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Ke
e
ping
Rename {git-
=
> git}remote-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
h
n Keep
i
ng
g
i
t
-
cvsimpo
r
t
.
txt: cvsps-
2
is d
e
pre
c
ated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
git-for-each-ref
.
t
xt: 'raw
'
is a supporte
d
date format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn
K
eeping
g
it-fast-import(
1
): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Joh
n
K
eep
i
ng
git
-
fast-impor
t
(
1
):
c
ombi
n
e documenta
t
i
o
n of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
Keeping
git-shortl
o
g
(
1
):
d
ocu
m
ent behaviour
of zero-
w
idth
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
dupl
i
cate
'-
-
do
n
e' option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John Kee
p
ing
D
o
c
um
e
n
tation
:
don't link to exampl
e
mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
J
o
hn
K
e
eping
rebase -
i
continu
e
: don't skip commits that o
n
ly c
h
ange
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree