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 branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03
John Kee
p
ing
gi
t
-
co
n
fi
g
:
update doc f
o
r --get with
m
ul
t
iple values
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-17
J
ohn Kee
p
ing
difftool: fix dir-
d
iff when file does
no
t
exist in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
John Keeping
merge-tree
:
h
andle directory
/
empty conf
l
ict correctly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-01
J
o
hn Keeping
contrib/subtree:
d
o
n'
t
delete remot
e
branches
if split
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Joh
n
Keep
i
ng
t/Ma
k
e
f
ile: remove smo
k
e tes
t
tar
g
ets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
Jo
h
n Keeping
merge-tree: fix typo in "bot
h
changed
i
dentically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
transp
o
rt-he
l
per:
a
d
d
'
s
igned-
t
ags'
c
apability
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keeping
transpor
t
-
h
e
lper: pass
--signed-tags=warn-strip to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Jo
h
n
Keepin
g
fast-export:
a
d
d --signed-tags=warn-stri
p
mod
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
Joh
n
Keepi
n
g
t
/tes
t
-lib
.
s
h: f
i
x TR
A
SH_DIR
E
CTORY handling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John Keepi
n
g
merge-tree: don't pri
n
t en
t
rie
s
t
h
at
m
atch "local"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
J
o
hn Keepin
g
gitremo
t
e-helpers(1): clarif
y
refspec behavio
u
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
ee
p
i
ng
submodule: print graph output next to submodule l
o
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
di
f
f: allow un
s
tuck arguments with --
d
iff-al
g
orit
h
m
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John
K
eeping
gi
t
-merge(1)
:
document d
i
ff-algorithm option to me
r
ge
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Kee
p
ing
b
i
sect: avoid signed
inte
g
er o
v
erflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
John Keeping
dif
f
core-break
:
don't
divide by
z
ero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
o
hn Keeping
t7800
:
r
un --dir-diff test
s
with an
d
witho
u
t
s
ymlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800: fix
tests
w
hen difftool uses -
-
no-symlin
k
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepi
n
g
t7800: don't hide grep output
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
J
ohn Keeping
difftool: d
o
n'
t
overwrite modified
f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move
'--sym
l
inks'
s
pecific te
s
t
to
t
he end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keepi
n
g
m
e
r
g
e-tree: fi
x
typo in me
r
g
e
-
tree
.
c::
u
nresolved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John K
e
epin
g
r
efs
.
c: fix fread error han
d
ling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
entry
:
f
i
x filter looku
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
ep
i
ng
t2003:
moder
n
i
ze style
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Keepi
n
g
d
i
fftool
--dir
-
di
f
f: symlink all fil
e
s matching t
h
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
d
i
fftool:
a
v
o
id double
s
la
s
hes in
s
ymlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Kee
p
ing
git-d
i
ff
t
ool(1):
fix
f
ormatting
of --symlink des
c
r
iption
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John Keepin
g
Revert "graph
.
c: mark private
file-scope
s
ymb
o
ls a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
oh
n
Keeping
Makefile: make mandir,
h
tm
l
d
i
r
and
info
d
i
r absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
re
b
ase
-
i
:
respect core
.
comment
c
har
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
Jo
h
n Keeping
combine-diff
.
c: t
e
a
c
h combine
d
dif
f
s about line
prefix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Keeping
diff
.
c: use diff_lin
e
_prefix() wh
e
re
appli
c
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
hn Ke
e
ping
di
f
f: ad
d
dif
f
_line
_
prefix function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Kee
p
i
n
g
dif
f
.
c:
m
a
k
e
c
onstant str
i
ng
argumen
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: wr
i
te prefix to the co
r
rect file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
John Keeping
graph: output padding for
m
erge subsequent p
a
rents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepin
g
t4038: add tests fo
r
"diff
-
-cc --
r
aw <
t
rees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Joh
n
K
e
eping
bui
l
tin/apply: t
i
g
h
ten (dis)similarity index pa
r
si
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
J
o
hn Keeping
mergetool--lib: list us
e
r configured tools in '--
t
ool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
Rename {git- =>
git}rem
o
te-helpers
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
Jo
h
n Keeping
Co
d
in
g
Guid
e
l
i
nes: a
d
d Py
t
hon co
d
ing guidelines
commit
|
commitdiff
|
tree
2013-01-28
John Keeping
g
i
t-remote-testp
y
: fix path hashi
n
g on Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
John
K
e
e
pi
n
g
mergetool--lib: don't call "exit
"
in se
t
up_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-di
f
ftool: use git
-
me
r
g
etool--lib for "--tool-h
e
lp"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetoo
l
: don't hard
c
ode 'mergetool' in s
h
ow_too
l
_help
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keep
i
ng
git-mer
g
etool: remove re
d
undant assignment
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keepi
n
g
git-mergetool: mov
e
show_too
l
_
h
el
p
to merget
o
ol--lib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git-rem
o
t
e
-te
s
tpy
:
call print
as
a
function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Jo
h
n Keeping
g
it
-
remote-testpy: don't do unbuffe
r
ed
text
I
/
O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-remote-t
e
stpy:
h
ash bytes explic
i
t
ly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn
K
eeping
svn-fe: allow s
v
n
rdump_si
m
.
py to
r
un w
i
th Python
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
h
n
Keepi
n
g
gi
t
_remote_helpers: use 2to3
if buil
d
ing with
Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Kee
p
ing
git_remote
_
h
e
l
pers
:
force r
e
build
i
f pytho
n
versio
n
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
J
o
h
n
Keeping
g
i
t-cvsimpo
r
t
.
t
xt: cvsps
-
2 is dep
r
ecated
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
J
o
h
n
K
eeping
git-f
o
r-each-ref
.
txt: 'raw' is a sup
p
orted date fo
r
m
a
t
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
o
hn Keepi
n
g
gi
t
_remote_he
l
pers:
fix input
w
hen running under
P
y
t
hon 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn
Ke
e
ping
git_remote_helpers: allow b
u
ilding with Pyt
h
on 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
J
ohn Keeping
g
i
t-svn:
teach
f
ind-rev to find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keepi
n
g
git-fa
s
t
-
import(1): reorganise options
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
g
i
t-fa
s
t-import(1
)
:
c
o
mbine documentation of --[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-shortlog(
1
): d
o
cument behaviour of zero-
w
idth
w
rap
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
J
o
h
n Keeping
git-fast-import(1)
:
rem
o
ve
dupl
i
cate '--done' o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
Keeping
Do
c
umentat
i
on: don't li
n
k to
e
x
ample mail
addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John
K
eepi
n
g
rebase -i
c
o
n
tinue: don'
t
skip commits tha
t
only chang
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree