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-tree: handle directory/empty conflict correctly
2013-05-07
John
K
e
eping
merge
-
tre
e
:
h
andle directo
r
y
/empty confl
i
ct corre
c
tly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merg
e
-
tree
:
f
i
x typo in "both
c
hanged ident
i
ca
l
l
y"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John Keeping
merge-tree:
d
on't p
r
int e
n
tries th
a
t match
"local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-tree:
fix ty
p
o in mer
g
e-tre
e
.
c::unresolved
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John Keeping
t
4038: add tests f
o
r "diff --c
c
--raw <trees>"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
John Keeping
builtin/a
p
p
ly
:
tigh
t
e
n
(dis
)
simila
r
ity
index parsing
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Ren
a
me {gi
t
- => git}remote-helpe
r
s
.
txt
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-c
v
si
m
port
.
txt
:
c
v
s
ps-2 is deprecate
d
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
g
i
t-f
o
r-each-ref
.
txt: 'raw' is a supported
date for
m
at
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
g
it-fas
t
-import(1): reorga
n
ise
o
p
t
ions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
o
hn
K
e
e
ping
git-fast-i
m
port(
1
): combine docu
m
entation of --[no
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
J
oh
n
K
eepin
g
git-shortlog(1): document be
h
a
v
iour o
f
zer
o
-w
i
dth wrap
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fas
t
-import(1): r
e
move duplicate
'--done'
option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
J
o
h
n Kee
p
ing
Docume
n
tation: do
n
'
t link to example mai
l
addresse
s
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
John Kee
p
ing
rebase -
i
con
t
in
u
e: do
n
't skip
c
ommits that only
c
ha
n
ge
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree