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-tree: handle directory/empty conflict correctly
2013-05-07
John Keeping
merge
-
tr
e
e: handle
d
irectory/empty conflict c
o
rrectly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
mer
g
e
-
tree
:
fix typo i
n
"both changed identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Ke
e
ping
m
e
r
ge-tree:
d
o
n't print entries that match "lo
c
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Ke
e
p
i
ng
merge-tree: fix t
y
p
o i
n
merge
-
tree
.
c:
:
unre
s
olved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John
K
ee
p
i
n
g
t
4
038:
a
dd
tests for "diff -
-
cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n
Keeping
b
u
ilt
i
n
/
apply: tighten (dis)sim
i
l
arity index parsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {
g
it- => git}r
e
m
ote-hel
p
ers
.
t
xt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John Keeping
git-cvsimport
.
txt: cvsps-2 is de
p
recated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
John Keeping
g
i
t-
f
or-
e
ach-ref
.
txt: '
r
aw' is a
supported
d
a
te format
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fas
t
-
i
mpor
t
(1
)
: reorganise
o
ptions
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n Keepin
g
git-fast-
i
mport(1): combi
n
e doc
u
mentation of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-shor
t
log(1):
d
o
cument beh
a
viour of zero-w
i
d
th wrap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-import(1
)
:
r
e
m
ove duplicat
e
'--done
'
option
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
eeping
Documentation:
d
on't link to e
x
a
mple mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
rebase
-i continue: d
o
n't s
k
ip commits
t
h
at only change
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree