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
ls-files -k: a directory only can be killed if the index has a non-directory
2013-05-17
John Keeping
difftool: fix
d
ir-diff
w
hen file does not exis
t
in
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-05-07
J
o
h
n Keepin
g
mer
g
e
-
tree: handle dire
c
tory/empty conflict c
o
rre
c
tly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
J
ohn Keeping
t/Ma
k
efile: remove
s
moke te
s
t targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
me
r
ge-
t
ree: f
i
x
typo in "both cha
n
ged identically"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
J
o
hn Ke
e
p
i
n
g
t
r
ansport-h
e
lper: add 'signed
-
tags' capabili
t
y
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
Keeping
trans
p
ort-helper: p
a
ss -
-
signe
d
-tags=warn-strip
to
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John
K
eeping
fast
-
exp
o
rt: add --s
i
gned-tags=warn-
s
trip mode
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-15
John Keep
i
ng
t/test-l
i
b
.
s
h: fix TRASH_DIRECTORY
h
andling
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
merge-tr
e
e: don't print e
n
tries that match "l
o
c
a
l"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-07
Jo
h
n
K
eeping
gitr
e
mote-helpers(1): clari
f
y refspec
b
ehaviou
r
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
J
oh
n
K
e
e
p
ing
submodul
e
: print graph output ne
x
t
to
s
ub
m
odule lo
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
d
iff
:
allow un
s
tuck arg
u
m
ents with --diff-algorithm
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-05
John Keeping
g
i
t-m
e
rge(1):
d
o
c
u
ment
diff
-
a
l
gorit
h
m o
p
tion to
merg
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
bi
s
ect: avoid signed inte
g
er overflow
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-04-03
J
o
hn Keeping
diffcore-br
e
ak: don't divide by zero
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John
K
eeping
t
7
8
00: run --dir
-
diff
t
ests
with a
n
d w
i
thout symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Ke
e
ping
t78
0
0
:
f
ix
t
est
s
when difftool uses --no-symlinks
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keepin
g
t7800: don't hide grep out
p
ut
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Kee
p
ing
d
i
f
ftool
:
don't overw
r
ite
modified f
i
les
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-29
John Keeping
t7800: move '--symli
n
ks' specific test to the end
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
me
r
ge
-
tree: fix typo in
merg
e
-tr
e
e
.
c::unreso
l
ved
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-24
John
Keeping
refs
.
c: fix fread error han
d
l
i
n
g
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Kee
p
ing
e
n
try: fi
x
filter lookup
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John K
e
eping
t
2
003: modernize sty
l
e
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
Jo
h
n Keeping
difftool
--dir-diff: symlink all
f
il
e
s mat
c
hing
t
he
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John Ke
e
ping
difftool: avoid double slashes
in symlink targets
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-14
John
Keeping
git-difftool(1):
f
ix formatt
i
ng of
-
-
sym
l
in
k
descripti
o
n
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-03-04
John
Keeping
R
evert "
g
r
a
ph
.
c: mark private fi
l
e
-
s
c
o
pe sym
b
o
l
s
a
s
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-25
J
ohn Keepi
n
g
Mak
e
fi
l
e: mak
e
man
d
ir, htmld
i
r
and infodir absolute
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
rebase -i
:
r
e
spect
c
ore
.
commentchar
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
o
h
n
Keeping
c
o
mbine-diff
.
c: teach co
m
bine
d
diffs about line pr
e
fix
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John
K
eeping
diff
.
c: use d
i
ff_line_prefix() w
h
ere ap
p
li
c
able
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Ke
e
p
i
ng
diff:
a
dd
diff_line_prefix
f
unction
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
J
ohn Keeping
dif
f
.
c: make
cons
t
ant s
t
ring argu
m
e
n
t
s const
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-12
John Keeping
diff: writ
e
p
r
e
f
i
x to the correct file
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-07
J
o
hn K
e
eping
graph
:
outp
u
t padding for
m
e
r
ge subse
q
uent parents
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-05
John Keepi
n
g
t4038:
a
dd te
s
ts for "diff --cc --raw <trees>"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
Jo
h
n
K
eepin
g
builtin/apply:
tigh
t
en (di
s
)s
i
milarity index
p
arsing
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-03
John
Keeping
m
erge
t
ool-
-
lib: list user confi
g
ured tools
in '--tool
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-02-01
John Keeping
R
e
n
ame {git- =>
g
it}
r
emote-he
l
pe
r
s
.
txt
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-30
John Keep
i
ng
Co
d
i
n
g
G
uidelines: add Py
t
hon co
d
i
n
g guidelines
commit
|
commitdiff
|
tree
2013-01-28
John
K
eeping
git-re
m
ote-testpy: fix pat
h
has
h
ing on Pyth
o
n
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-28
Jo
h
n Keeping
merget
o
ol-
-
lib: d
o
n't call
"
exi
t
"
in s
e
tup_tool
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
i
t-d
i
ff
t
o
o
l: use git-mer
g
et
o
ol
-
-
lib f
o
r
"--tool-hel
p
"
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git-merg
e
tool:
don't hardcode 'mergetool' in show_tool_h
e
lp
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
ng
g
it-merget
o
ol: remove redundant assign
m
ent
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
g
it
-
mergetool
:
move
show_tool_h
e
lp to mergetool--
l
ib
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
Joh
n
Keeping
git-remote-
t
estpy: call print as a function
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
p
i
n
g
g
it-remote-testpy: don't do
u
nbuff
e
red text I/O
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
o
hn
K
eeping
git-rem
o
te-testpy: hash
b
ytes explicitly
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Ke
e
ping
svn-fe: a
l
l
o
w svnrdump
_
sim
.
py to run
with Python 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
J
ohn Keep
i
n
g
g
it_remote
_
helpers:
u
se 2to3
if buildi
n
g with
P
y
t
h
o
n 3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-25
John Keeping
git_remote_helpers: force rebuild
i
f pyth
o
n version
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-24
John
Keeping
git-cvsimport
.
txt: cv
s
ps-2 i
s
deprec
a
te
d
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-22
Joh
n
Keeping
gi
t
-for-each-ref
.
tx
t
: 'raw'
i
s a supported da
t
e
f
ormat
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Kee
p
ing
git_remote_helpers: fix input when
r
unnin
g
unde
r
P
ython
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-21
J
ohn Keeping
git_remote
_
helpers: allow building with Pyt
h
on
3
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-17
John Keeping
g
i
t-svn: teach find
-
rev
to find near matches
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John
K
eeping
g
i
t-fa
s
t-i
m
port
(
1
): r
e
or
g
anise optio
n
s
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
J
ohn Keeping
gi
t
-fast-import(1):
combine d
o
cume
n
tation
o
f -
-
[no
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-09
John Keep
i
ng
g
i
t-sho
r
t
log(1): documen
t
behaviour of zero-width wr
a
p
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2013-01-08
John Ke
e
ping
git-f
a
st-i
m
po
r
t
(
1
): re
m
o
v
e d
u
p
l
i
c
ate '--do
n
e' o
p
tion
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-12-17
John
K
e
ep
i
n
g
D
o
cumenta
t
ion: don't link
to example mail addresses
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree
2012-04-09
John Ke
e
ping
rebase -i continue:
don't ski
p
commits that only chang
e
.
.
.
Signed-off-by:
John Keeping
<john@keeping.me.uk>
commit
|
commitdiff
|
tree