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 Keeping
m
e
rge-tree: handle
d
irectory/
e
mpty con
f
li
c
t
correctly
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-28
John K
e
eping
me
r
ge-tree: f
i
x typo
in "both cha
n
ged identi
c
a
l
ly"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-04-08
John Keep
i
ng
merge-tree: do
n
't prin
t
entries that m
a
tch "local"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-03-27
J
o
hn K
e
eping
me
r
ge-tree: fix typo in
merge-tree
.
c::unresol
v
ed
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-05
John K
e
eping
t4038: add te
s
t
s
fo
r
"diff --cc --
r
aw <tr
e
es
>
"
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
builtin/apply:
tighten (d
i
s)similarity index pars
i
ng
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-02-01
J
o
h
n
K
eep
i
n
g
R
ename
{g
i
t- => git}remote-helpers
.
tx
t
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-24
J
o
hn Keeping
git-cv
s
im
p
ort
.
txt
:
cvsps
-
2 is deprecated
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-22
J
o
hn Keepin
g
git-
f
or-each-ref
.
txt: 'raw' is a supporte
d
date format
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John
K
eepin
g
git-
f
ast-import(1):
r
e
o
rg
a
nise op
t
ions
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fast-
i
mport
(
1): combine documentation of --[
n
o
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n K
e
eping
g
i
t
-sho
r
t
log(1)
:
document behavio
u
r
of zero-width wrap
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2013-01-08
Joh
n
Ke
e
ping
git-fast-imp
o
r
t
(1): rem
o
ve d
u
plicate '--done' option
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-12-17
Joh
n
Keeping
Documentation:
d
on't l
i
nk to example
m
ail
addr
e
sses
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree
2012-04-09
John Keeping
rebase -i continue: don't skip c
o
mmits that only change
.
.
.
Signed-off-by: John Keeping <
john@keeping.me.uk
>
commit
|
commitdiff
|
tree